Merge remote-tracking branch 'upstream/master' into use-development-exception-page

This commit is contained in:
Mark Monteiro
2020-04-01 23:09:55 +02:00
236 changed files with 1246 additions and 974 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