Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -04:00
..
AuthenticatedAttribute.cs	Replace custom code with Asp.Net Core code	2019-08-09 22:36:20 +02:00
AuthorizationInfo.cs	Initial migration code	2020-05-12 22:10:35 -04:00
BasePeriodicWebSocketListener.cs	Merge branch 'master' into websocket	2020-05-02 00:54:04 +02:00
IAuthorizationContext.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
IAuthService.cs	Initial migration code	2020-05-12 22:10:35 -04:00
IHasResultFactory.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
IHttpResultFactory.cs	Fix warnings	2020-01-31 22:26:53 +01:00
IHttpServer.cs	Rename function	2020-05-14 16:15:09 -07:00
ISessionContext.cs	Initial migration code	2020-05-12 22:10:35 -04:00
IWebSocketConnection.cs	Fix warnings	2020-01-31 22:26:53 +01:00
IWebSocketListener.cs	Lower the amount of running tasks	2019-03-25 21:33:48 +01:00
SecurityException.cs	Clean up SecurityException	2020-04-13 13:13:48 -04:00
StaticResultOptions.cs	Fix warnings	2020-01-31 22:26:53 +01:00
WebSocketMessageInfo.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00