Conflicts: vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
= Gallery This project rocks and uses MIT-LICENSE.
Conflicts: vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
= Gallery This project rocks and uses MIT-LICENSE.