3 Commits

Author	SHA1	Message	Date
saurabhbhatia	07964de968	both manual and automatic methods working ... Conflicts: config/routes.rb	2014-01-13 15:57:49 +08:00
saurabhbhatia	d226b34de5	Added Automatic Synchronize ... Conflicts: Gemfile app/controllers/admin/import_data_controller.rb vendor/built_in_modules/personal_conference/app/models/writing_conference.rb Conflicts: Gemfile app/controllers/admin/import_data_controller.rb	2014-01-13 15:57:48 +08:00
saurabhbhatia	43da2eca79	Import Data, Sync Data ... 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	2014-01-13 15:57:48 +08:00