Orbit/vendor/built_in_modules/personal_journal
saurabhbhatia f8ad13a9f5 Import Data, Sync Data
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
2013-11-15 17:36:35 +08:00
..
app Import Data, Sync Data 2013-11-15 17:36:35 +08:00
config new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
db correct model method 2013-04-17 14:07:24 +08:00
lib
script
spec/factories remove redundant space of co_author sample data 2013-04-17 11:04:52 +08:00
.gitignore
Gemfile
MIT-LICENSE
README.rdoc
Rakefile
init.rb new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_journal.gemspec
personal_journal.json

README.rdoc

= PersonalJournal

This project rocks and uses MIT-LICENSE.