Martin Konecny c19b7f7c6e Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/models/MusicDir.php install_full/ubuntu/airtime-full-install install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py		2011-11-14 21:19:56 -05:00
..
apache	CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime	2011-08-22 12:03:09 -04:00
ubuntu	Merge branch '1.9.1' into devel	2011-11-14 21:19:56 -05:00