Orbit/vendor/built_in_modules/personal_conference/app
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
..
assets Import Data, Sync Data 2013-11-15 17:36:35 +08:00
controllers Import Data, Sync Data 2013-11-15 17:36:35 +08:00
helpers fixed file view on server for desktop 2013-10-14 16:49:54 +08:00
mailers relpace seminar to conference 2013-02-04 18:01:38 +08:00
models Import Data, Sync Data 2013-11-15 17:36:35 +08:00
views Import Data, Sync Data 2013-11-15 17:36:35 +08:00