d47b300dcf
Conflicts: 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 |
||
---|---|---|
.. | ||
.gitkeep | ||
conference_author_type.rb | ||
conference_co_author.rb | ||
conference_co_author_relation.rb | ||
conference_paper_type.rb | ||
personal_conference_intro.rb | ||
writing_conference.rb | ||
writing_conference_category.rb | ||
writing_conference_file.rb |