This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
orbit-4-1/app/views/admin/import_data
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
..
get_announcement_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
get_book_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
get_conference_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
get_journal_paper_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
get_page_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
get_teacher_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
sync_book_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
sync_conference_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00
sync_journal_paper_data.html.erb Import Data, Sync Data 2014-01-13 15:57:48 +08:00