Merge remote-tracking branch 'upstream/master' into do-not-instantiate-services-at-startup

This commit is contained in:
Mark Monteiro
2020-04-01 23:05:36 +02:00
236 changed files with 1245 additions and 973 deletions

View File

@@ -11,8 +11,8 @@ using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.Net.Http.Headers;
namespace Emby.Server.Implementations.HttpServer