denise b0e93005e5 Merge branch '2.1.x' into devel		2012-06-15 15:04:18 -04:00
..
musicdirs.js	CC-3561: Add button to automatically rescan watched folders.	2012-06-15 12:16:19 -04:00
preferences.js	CC-3718: Please enable user to input the mail server settings	2012-06-11 15:18:12 -04:00
streamsetting.js	CC-3927: Should automatically switch back to Master/Show stream if there	2012-06-13 12:46:26 -04:00
support-setting.js	CC-2926 : Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome	2011-12-09 13:07:33 +01:00