You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
IInstallationManager.cs	Merge branch 'dev' into reformat	5 years ago
InstallationEventArgs.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	5 years ago
InstallationFailedEventArgs.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	5 years ago