Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel ... Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/PlaylistController.php airtime_mvc/application/models/Playlist.php python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py		2012-07-16 14:31:03 -04:00
..
DoctrineMigrations	Merge branch '2.1.x' into devel	2012-06-29 10:57:14 -04:00
include	CC-4104: airtime-uninstall should not purge airtime database be default	2012-07-16 14:18:40 -04:00
upgrades	-no longer require "cell_phone" column for 2.1.3 upgrade	2012-07-10 19:05:27 -04:00
airtime-dircheck.php	CC-2518: Auto install script for manual install	2011-07-19 17:30:23 -04:00
airtime-install	Random commits gathered and put into one	2012-07-09 18:58:22 -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-4104: airtime-uninstall should not purge airtime database be default	2012-07-16 14:18:40 -04:00