Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/public/js/airtime/preferences
History
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 		2013-12-17 17:20:38 -05:00
..
musicdirs.js CC-2184: Hardcoded CSS path should be relative path instead 2013-01-14 16:00:38 -05:00
preferences.js Merge branch '2.3.x-saas' into 2.4.x-saas 2013-05-21 16:40:10 -04:00
streamsetting.js Removed old jquery syntax 2013-09-06 11:08:01 -04:00
support-setting.js CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00