f3e40c1405
Conflicts: Gemfile.lock vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb 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 | ||
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.