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

@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Services;
using Emby.Server.Implementations.HttpServer;
namespace Emby.Server.Implementations.Services
{
@@ -241,7 +241,7 @@ namespace Emby.Server.Implementations.Services
responses = responses,
security = new [] { apiKeySecurity }
security = new[] { apiKeySecurity }
};
}