Conflicts: config/mongoid.yml vendor/built_in_modules/personal_book/app/models/writing_book.rb vendor/built_in_modules/personal_conference/app/models/writing_conference.rb vendor/built_in_modules/personal_journal/app/models/writing_journal.rb |
||
|---|---|---|
| .. | ||
| built_in_modules | ||
| plugins | ||