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-2.2.0	cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists	2012-10-23 14:20:41 -04:00
airtime-2.2.1	merge from devel	2012-12-03 11:07:47 -05:00
airtime-2.3.0	Added locales for English localizations	2013-04-02 17:19:48 +01:00
airtime-2.3.1	CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade	2013-03-05 17:17:31 -05:00
airtime-2.4.0	CC-5239	2013-06-14 15:25:45 -04:00
airtime-2.4.1	adding upgrades to 2.4.1 for version.	2013-08-28 11:54:34 -04:00
airtime-2.5.0	CC-5420 : Upgrade: sql error	2013-10-15 15:33:13 -04:00
airtime-2.5.1	Update version number in airtime-constants.php	2013-12-09 15:30:30 -05:00
airtime-2.5.2/data	CC-5810 : Installation can have race conditions with the cache	2014-04-23 15:41:15 -04:00
airtime-2.5.3	CC-5781: Upgrade script for new storage quota implementation	2014-04-10 07:12:31 -04:00
upgrade-template	remove \r line endings	2012-10-30 13:23:09 -04:00