Commit Graph

1 Commits

Author SHA1 Message Date
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