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/vendor/built_in_modules/faq/app
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
..
assets faq app 2013-03-28 14:09:29 +08:00
controllers New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
helpers faq app 2013-03-28 14:09:29 +08:00
mailers faq app 2013-03-28 14:09:29 +08:00
models New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
views removed old calendar and updated new calendar event category 2013-07-23 12:13:02 +08:00