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
..
ACL.php	CC-3174 Show Builder	2012-01-16 09:56:57 +01:00
airtime-conf-production.php	-various optimizations	2012-01-09 17:47:58 -05:00
airtime-conf.php	CC-2591: Allow upload of any audio clip to Soundcloud	2011-09-22 11:47:24 -04:00
application.ini	CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.	2012-02-12 15:31:17 -05:00
classmap-airtime-conf.php	CC-3110 : Password reset	2011-12-21 16:01:29 -08:00
conf.php	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
constants.php	CC-3289: Widgets should have a version string so users can make sure widgets are up to date	2012-02-09 15:04:52 -05:00
navigation.php	CC-3174 : showbuilder	2012-02-05 18:19:22 +01:00