6b9926539d
Conflicts: app/assets/javascripts/orbitdesktop.js app/controllers/desktop_publications_controller.rb config/routes.rb |
||
---|---|---|
.. | ||
appstore | ||
books | ||
journal_pages | ||
settings | ||
app_manager.html.erb | ||
app_view1.html.erb | ||
appstore.html.erb | ||
books.html.erb | ||
desktop.html.erb | ||
index.html.erb | ||
journal_p.html.erb | ||
orbit.html.erb | ||
sections.html.erb | ||
settings.html.erb |