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
..
AirtimeIni.php	…
AirtimeInstall.php	CC-5810 : Installation can have race conditions with the cache	2014-04-23 15:41:15 -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	…
airtime-install.php	…
airtime-installed-check.php	…
airtime-remove-files.sh	…
airtime-uninitialize.sh	…
airtime-uninstall.php	…
airtime-upgrade.php	Fixed a bunch of installer stuff for Naomi	2014-04-23 12:21:39 -04:00