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
..
DoctrineMigrations	Merge branch '2.1.x' into devel	2012-06-29 10:57:14 -04:00
include	update install script to take into account new config location	2013-05-17 11:28:27 -04:00
upgrades	CC-5239	2013-06-14 15:25:45 -04:00
airtime-dircheck.php	CC-2518: Auto install script for manual install	2011-07-19 17:30:23 -04:00
airtime-install	CC-5071: Better RabbitMQ passwords	2013-05-08 16:59:43 -04:00
airtime-php.ini	CC-2819: Upgrade from 1.8.2 to 1.9.4-RC2 fails on Debian squeeze with 'Failed sql query'	2011-09-14 16:47:07 -04:00
airtime-uninstall	CC-5071: Better RabbitMQ passwords	2013-05-08 15:53:53 -04:00