Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1 ... # Conflicts: # Emby.Dlna/Emby.Dlna.csproj # Emby.Dlna/Eventing/DlnaEventManager.cs # Emby.Dlna/Service/BaseService.cs # Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs # MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs		2020-08-24 20:04:13 -04:00
..
Configuration	Enable StyleCop for MediaBrowser.Common	2020-06-03 13:04:45 +02:00
Cryptography	Enable Microsoft.CodeAnalysis.FxCopAnalyzers for Jellyfin.Common	2020-04-02 20:12:18 +02:00
Events	More warnings (removed)	2019-12-11 00:13:57 +01:00
Extensions	Update HttpContextExtensions.cs	2020-07-19 22:19:17 +01:00
Json	Ignore null json values	2020-08-23 07:48:12 -06:00
Net	Merge branch 'master' into SSDP	2020-06-20 15:33:13 -06:00
Plugins	Allow plugins to register services.	2020-08-16 17:25:14 -04:00
Progress	Enable StyleCop for MediaBrowser.Common	2020-06-03 13:04:45 +02:00
Properties	Adjusted AssemblyCopyright attribute values.	2019-03-14 22:17:56 +01:00
Providers	Fix some warnings	2020-02-23 12:11:43 +01:00
System	Minor improvements	2020-04-01 15:30:53 +02:00
Updates	Migrate ActivityLogEntryPoint.OnPackageInstallationFailed to IEventConsumer	2020-08-14 15:56:54 -04:00
Hex.cs	Apply suggestions from code review	2019-12-19 22:01:05 +01:00
IApplicationHost.cs	Allow plugins to register services.	2020-08-16 17:25:14 -04:00
MediaBrowser.Common.csproj	Update .NET Core to 3.1.6	2020-07-17 19:48:11 -04:00