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 |
||
---|---|---|
.. | ||
ad_banner | ||
announcement | ||
archive | ||
calendar | ||
faq | ||
gallery | ||
location | ||
miss_module/config/locales | ||
page_content | ||
personal_book | ||
personal_conference | ||
personal_diploma | ||
personal_experience | ||
personal_honor | ||
personal_journal | ||
personal_lab | ||
personal_patent | ||
personal_project | ||
personal_research | ||
web_resource |