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
..
musicdirs.js	CC-2561: Broken image links when selecting directory from server.	2011-07-18 17:09:03 -04:00
preferences.js	Merge branch '1.9.1' into devel	2011-08-18 19:05:13 -04:00
streamsetting.js	CC-2607: Ability to adjust stream bitrate, type, etc from UI	2011-08-18 13:53:12 -04:00
support-setting.js	CC-2701: Separate Support Settings from Preference page	2011-08-18 18:58:59 -04:00