6b9926539d
Conflicts: app/assets/javascripts/orbitdesktop.js app/controllers/desktop_publications_controller.rb config/routes.rb |
||
---|---|---|
.. | ||
admin | ||
application_controller.rb | ||
desktop_appstore_controller.rb | ||
desktop_controller.rb | ||
desktop_orbit_controller.rb | ||
desktop_publications_controller.rb | ||
gridfs_controller.rb | ||
orbit_backend_controller.rb | ||
orbit_frontend_component_controller.rb | ||
orbit_frontend_controller.rb | ||
orbit_widget_controller.rb | ||
otheraccounts_controller.rb | ||
pages_controller.rb |