Erwin de Haan 49b61f238e Merge branch 'dev' into reformat ... # Conflicts: # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs # Emby.Server.Implementations/LiveTv/LiveTvManager.cs # Emby.Server.Implementations/Security/MBLicenseFile.cs # Emby.Server.Implementations/Security/PluginSecurityManager.cs # Emby.Server.Implementations/Security/RegRecord.cs # MediaBrowser.Api/PluginService.cs # MediaBrowser.Api/System/SystemService.cs # MediaBrowser.Common/Security/IRequiresRegistration.cs # MediaBrowser.Common/Security/ISecurityManager.cs # MediaBrowser.Common/Security/PaymentRequiredException.cs # MediaBrowser.Model/Entities/MBRegistrationRecord.cs # MediaBrowser.Model/Entities/PluginSecurityInfo.cs # deployment/win-generic/build-jellyfin.ps1		2019-01-15 17:34:39 +01:00
..
EmbyTV	Merge branch 'dev' into reformat	2019-01-15 17:34:39 +01:00
Listings	ReSharper conform to 'var' settings	2019-01-13 21:37:13 +01:00
TunerHosts	ReSharper format: conform inline 'out' parameters.	2019-01-13 21:46:33 +01:00
LiveTvConfigurationFactory.cs	Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv	2019-01-13 20:54:44 +01:00
LiveTvDtoService.cs	Visual Studio Reformat: Emby.Server.Implementations Part Liv-P	2019-01-13 20:22:00 +01:00
LiveTvManager.cs	Merge branch 'dev' into reformat	2019-01-15 17:34:39 +01:00
LiveTvMediaSourceProvider.cs	Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv	2019-01-13 20:54:44 +01:00
RefreshChannelsScheduledTask.cs	Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv	2019-01-13 20:54:44 +01:00