CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-28 05:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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
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/HttpServer/WebSocketManager.cs
View file

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