devin
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
20 lines
190 B
Plaintext
20 lines
190 B
Plaintext
!.gitignore
|
|
.bundle
|
|
.DS_Store
|
|
.rvmrc
|
|
|
|
Gemfile.lock
|
|
|
|
db/*.sqlite3
|
|
log/*.log
|
|
public/assets
|
|
public/index.html
|
|
public/panel/**/*
|
|
public/uploads/**/*
|
|
solr
|
|
tmp/**/*
|
|
uploads/**/*
|
|
|
|
*.swp
|
|
*.pid
|
|
*.lck |