Martin Konecny 2a0c9769aa Merge branch '2.4.x' ... Conflicts: airtime_mvc/public/js/airtime/showbuilder/builder.js python_apps/pypo/liquidsoap_scripts/fdkaac.liq python_apps/pypo/schedule/pypofetch.py python_apps/pypo/schedule/telnetliquidsoap.py		2013-06-14 16:45:52 -04:00
..
application	Merge branch '2.4.x'	2013-06-14 16:45:52 -04:00
build	CC-5156: Hungarian language is shown in strange font on login page	2013-05-17 11:05:38 -04:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
locale	Merge branch '2.4.x' of https://github.com/danielhjames/Airtime into 2.4.x	2013-06-13 13:38:15 -04:00
public	Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x	2013-06-10 15:57:21 -04:00
tests	test commit	2012-10-29 19:19:48 -04:00