Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po		2014-04-23 15:58:39 -04:00
..
common	CC-5627 : Check all Application_Common_DateHelper calculations that use	2013-12-12 13:28:51 -05:00
configs	Double equals typo *ducks*	2014-04-22 15:56:29 -04:00
controllers	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-04-23 15:58:39 -04:00
forms	CC-5660: Unable to create shows with a rebroadcast	2014-01-06 14:04:18 -05:00
layouts/scripts	CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.	2013-12-16 17:14:00 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-04-23 15:58:39 -04:00
modules/rest	CC-5786: Quota Enforcement in the File Upload API	2014-04-14 12:13:48 -04:00
services	CC-5728: Problem when removing repeat option and changing start date	2014-03-10 17:41:57 -04:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	CC-5786: Quota Enforcement in the File Upload API	2014-04-14 11:24:39 -04:00
Bootstrap.php	CC-5594 : Remove all date_default_timezone_get()	2013-12-06 18:17:30 -05:00