Orbit/vendor/built_in_modules/calendar_new/app/models
saurabhbhatia 7e3993b67f removed old calendar and updated new calendar event category
Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
	vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
	vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb
2013-07-23 12:13:02 +08:00
..
.gitkeep new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
event.rb new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
event_category.rb removed old calendar and updated new calendar event category 2013-07-23 12:13:02 +08:00