Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer ...

Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po

2014-04-23 15:58:39 -04:00

..

airtime-constants.php

Changed airtime version in necessary places

2014-04-07 12:14:49 -04:00

airtime-copy-files.sh

Fixed a bunch of installer stuff for Naomi

2014-04-23 12:21:39 -04:00

airtime-db-install.php

CC-5810 : Installation can have race conditions with the cache

2014-04-23 15:41:15 -04:00

airtime-initialize.sh

Installer fix

2014-04-23 14:17:58 -04:00

airtime-install.ini

CC-2518: Auto install script for manual install

2011-07-19 17:30:23 -04:00

airtime-install.php

Rollback to requiring PHP 5.3 to fix Ubuntu 12.04 support

2013-12-17 12:56:56 -05:00

airtime-installed-check.php

-fix installation error

2013-01-15 15:37:26 -05:00

airtime-remove-files.sh

CC-5005: airtime-purge doesn't remove all files

2013-03-06 12:26:07 -05:00

airtime-uninitialize.sh

code cleanup

2013-04-07 20:20:21 -04:00

airtime-uninstall.php

CC-5089:

2013-05-06 17:12:48 -04:00

airtime-upgrade.php

Fixed a bunch of installer stuff for Naomi

2014-04-23 12:21:39 -04:00

AirtimeIni.php

CC-5071: Better RabbitMQ passwords

2013-05-09 11:20:38 -04:00

AirtimeInstall.php

CC-5810 : Installation can have race conditions with the cache

2014-04-23 15:41:15 -04:00