c8aa50ee87
1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb |
||
---|---|---|
.. | ||
appstore | ||
books | ||
patents | ||
research_domain | ||
research_project | ||
settings | ||
allsections.html.erb | ||
app_manager.html.erb | ||
app_view1.html.erb | ||
appstore.html.erb | ||
books.html.erb | ||
compatibility.html.erb | ||
desktop.html.erb | ||
index.html.erb | ||
orbit.html.erb | ||
research_d.html.erb | ||
research_p.html.erb | ||
settings.html.erb |