Martin Konecny 2a0c9769aa Merge branch '2.4.x' ... Conflicts: airtime_mvc/public/js/airtime/showbuilder/builder.js python_apps/pypo/liquidsoap_scripts/fdkaac.liq python_apps/pypo/schedule/pypofetch.py python_apps/pypo/schedule/telnetliquidsoap.py		2013-06-14 16:45:52 -04:00
..
CalendarService.php	CC-5208: DJ can try to edit show not assign to him	2013-06-07 11:17:35 -04:00
SchedulerService.php	CC-5215: Linked shows sometimes lose crossfades	2013-06-07 13:47:12 -04:00
ShowFormService.php	CC-5187: Edit show -> disable linking option if show is currently playing	2013-05-30 11:06:45 -04:00
ShowService.php	CC-5209: Calendar -> Repeat by 5th day of the week problem	2013-06-07 11:30:24 -04:00
UserService.php	Created a new service for show days	2013-03-11 16:18:40 -04:00