Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/models/Preference.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/public/js/airtime/preferences/preferences.js |
||
---|---|---|
.. | ||
airtime | ||
colorpicker/js | ||
contextmenu | ||
datatables | ||
fullcalendar | ||
jplayer | ||
libs | ||
plupload | ||
qtip | ||
serverbrowse | ||
timepicker |