Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore ...

# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs

2020-06-04 16:52:23 -04:00

..

SessionManager.cs

Merge branch 'master' into userdb-efcore

2020-06-04 16:52:23 -04:00

SessionWebSocketListener.cs

Fix code issues

2020-05-26 11:37:52 +02:00

WebSocketController.cs

Make SonarCloud happy

2020-05-02 01:30:04 +02:00