Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas ... Conflicts: python_apps/pypo/liquidsoap_scripts/ls_script.liq utils/phone_home_stat.php		2013-06-26 01:25:26 -04:00
..
application	Merge branch '2.4.x' into 2.4.x-saas	2013-06-26 01:25:26 -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/bitdevil/Airtime into 2.4.x	2013-06-20 14:12:42 -04:00
public	Merge branch '2.4.x' into 2.4.x-saas	2013-06-26 01:25:26 -04:00
tests	test commit	2012-10-29 19:19:48 -04:00