James f855da0f45 Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/configs/navigation.php install_minimal/DoctrineMigrations/Version20110711161043.php python_apps/api_clients/api_client.py		2011-08-18 19:05:13 -04:00
..
directory-config.phtml	CC-2466 Manage Music Folders should be Manage Media Folder	2011-06-29 16:40:49 -04:00
index.phtml	CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.	2011-04-14 18:55:04 -04:00
stream-setting.phtml	CC-2607: Ability to adjust stream bitrate, type, etc from UI	2011-08-18 13:53:12 -04:00
support-setting.phtml	CC-2701: Separate Support Settings from Preference page	2011-08-18 18:58:59 -04:00