denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime ... Conflicts: airtime_mvc/application/services/ShowService.php		2013-10-08 11:16:25 -04:00
..
CalendarService.php	CC-5309:Calendar-> Recording Show: Fail to open context menu	2013-08-23 14:23:47 -04:00
HistoryService.php	CRLF	2013-09-30 13:59:08 -04:00
SchedulerService.php	CC-5347 : isScheduled doesn't work for webstreams	2013-10-02 11:24:48 -04:00
ShowFormService.php	CC-5323: User's Timezone Can Improperly Edit Show	2013-09-25 17:18:23 -04:00
ShowService.php	Merge branch 'master' of https://github.com/jamieconnor/Airtime	2013-10-08 11:16:25 -04:00
UserService.php	history records for a show have times validated within show range.	2013-08-30 00:43:43 -04:00