b5571dbc43
Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb |
||
---|---|---|
.. | ||
admin | ||
application_controller.rb | ||
desktop_appstore_controller.rb | ||
desktop_controller.rb | ||
desktop_orbit_controller.rb | ||
desktop_publications_controller.rb | ||
desktop_research_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 | ||
sessions_controller.rb |