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
..
jellyfin	Build scripts and build system consolidation.	2019-01-10 19:45:30 +01:00
jellyfin.service.conf	Build scripts and build system consolidation.	2019-01-10 19:45:30 +01:00
logging.json	Merge branch 'dev' into reformat	2019-01-15 17:34:39 +01:00