Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel ... Conflicts: VERSION airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Nowplaying.php airtime_mvc/application/models/Show.php airtime_mvc/application/models/airtime/CcShowInstances.php		2012-02-14 14:47:07 -05:00
..
add-show.js	CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter	2012-01-18 10:28:41 -05:00
full-calendar-functions.js	CC-3174 : showbuilder	2012-02-08 12:53:46 +01:00
schedule.js	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00