Albert Santoni 1aa99e2896 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po		2014-07-15 16:41:29 -04:00
..
common	CC-5627 : Check all Application_Common_DateHelper calculations that use	2013-12-12 13:28:51 -05:00
configs	Remove database credentials from application.ini	2014-05-02 15:50:37 -04:00
controllers	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-07-15 16:41:29 -04:00
forms	CC-5859: Airtime Analyzer: format fields before writing to db	2014-05-26 17:13:45 -04:00
layouts/scripts	CC-5833: Update airtime demo w/o o.p.s.	2014-06-06 17:12:55 -04:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-07-15 16:41:29 -04:00
modules/rest	Fix error due to bad exception throwing	2014-06-11 13:35:10 -04:00
services	CC-5634: Can add/remove content to a linked show while one instance is currently playing	2014-06-09 12:07:27 -04:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-06-09 11:36:51 -04:00
Bootstrap.php	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-07-15 16:41:29 -04:00