Luke Pulverenti 170f463664 mix merge conflicts

2015-11-20 23:55:26 -05:00

..

EmbyTV.cs

switch recording provider to AddOrUpdate

2015-11-17 23:18:51 -05:00

EntryPoint.cs

update hls

2015-08-28 20:50:39 -04:00

ItemDataProvider.cs

mix merge conflicts

2015-11-20 23:55:26 -05:00

RecordingHelper.cs

fix windows restart

2015-09-21 21:05:33 -04:00

SeriesTimerManager.cs

continue file system rework

2015-10-04 00:23:11 -04:00

TimerManager.cs

mix merge conflicts

2015-11-20 23:55:26 -05:00