Patrick Barron a225f34796 Merge branch 'master' into authenticationdb-efcore ... # Conflicts: # Jellyfin.Api/Helpers/RequestHelpers.cs		2021-05-18 18:09:46 -04:00
..
Security	Merge branch 'master' into authenticationdb-efcore	2021-05-18 18:09:46 -04:00
WebSocketConnection.cs	FxCop -> Net Analyzers (part 2)	2021-03-13 22:33:28 +01:00
WebSocketManager.cs	add simple auth handling to websocketmanager	2021-04-05 15:12:47 +02:00