drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/controllers/PluploadController.php airtime_mvc/application/views/scripts/plupload/index.phtml		2014-10-08 11:46:08 -04:00
..
DoctrineMigrations	Merge branch '2.1.x' into devel	2012-06-29 10:57:14 -04:00
include	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-10-08 11:46:08 -04:00
upgrades	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-04-23 15:58:39 -04:00
airtime-dircheck.php	CC-2518: Auto install script for manual install	2011-07-19 17:30:23 -04:00
airtime-install	Fixed a bunch of installer stuff for Naomi	2014-04-23 12:21:39 -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