alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-18 00:06:27 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into authenticationdb-efcore

Browse Source 
# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs
This commit is contained in:
Patrick Barron
2021-06-18 18:47:44 -04:00
parent 336ba2879f c791c3a215
commit be88efce3c
357 changed files with 3277 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Session/SessionManager.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Server.Implementations/Session/SessionWebSocketListener.cs
View File

@@ -1,3 +1,5 @@
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;

2
Emby.Server.Implementations/Session/WebSocketController.cs
View File

@@ -1,6 +1,4 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
#nullable enable
using System;
using System.Collections.Generic;