a62ff9308f
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 | ||
lib | ||
script | ||
spec/factories | ||
.gitignore | ||
Gemfile | ||
Gemfile.lock | ||
MIT-LICENSE | ||
README.rdoc | ||
Rakefile | ||
init.rb | ||
personal_journal.gemspec | ||
personal_journal.json |
README.rdoc
= PersonalJournal This project rocks and uses MIT-LICENSE.