sintonia/airtime_mvc/build
Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x
Conflicts:
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-01 10:30:00 -04:00
..
sql Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
airtime-php.logrotate CC-4119: zendphp.log is not rotated 2012-08-20 16:05:25 -04:00
airtime.conf Changed default base directory in airtime.conf and api_client.cfg 2013-01-15 13:47:35 -05:00
build.properties CC-5651: Unit Test the Scheduler 2014-01-13 11:43:17 -05:00
runtime-conf.xml CC-5651: Unit Test the Scheduler 2014-01-13 11:43:17 -05:00
schema.xml CC-5316 : Playout History: Doesn't support webstream 2013-09-30 13:56:27 -04:00