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 |
||
---|---|---|
.. | ||
desktop | ||
FontAwesome.otf | ||
entypo.dev.svg | ||
entypo.eot | ||
entypo.svg | ||
entypo.ttf | ||
entypo.woff | ||
fontawesome-webfont.eot | ||
fontawesome-webfont.svg | ||
fontawesome-webfont.ttf | ||
fontawesome-webfont.woff |