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 |
||
|---|---|---|
| app | ||
| config | ||
| db | ||
| doc | ||
| lib | ||
| log | ||
| patch | ||
| public | ||
| script | ||
| solr/conf | ||
| spec | ||
| tmp | ||
| vendor | ||
| .gitignore | ||
| .rspec | ||
| Gemfile | ||
| Gemfile.lock | ||
| Guardfile | ||
| README.md | ||
| Rakefile | ||
| config.ru | ||
| dump.rdb | ||
README.md
Ruling Orbit
RulingSite-s Version 4