Harry Bomrah
774cc5d392
Conflicts: app/assets/javascripts/desktop/orbitdesktop.js app/controllers/admin/import_data_controller.rb Conflicts: vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb |
||
---|---|---|
.. | ||
app | ||
config | ||
db | ||
lib | ||
script | ||
spec/factories | ||
.gitignore | ||
Gemfile | ||
MIT-LICENSE | ||
README.rdoc | ||
Rakefile | ||
init.rb | ||
personal_journal.gemspec | ||
personal_journal.json |
README.rdoc
= PersonalJournal This project rocks and uses MIT-LICENSE.