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
..
ApiKeyService.cs	rename session folder	2020-02-06 00:47:50 +09:00
SessionInfoWebSocketListener.cs	Fix some 'bugs' flagged by sonarcloud	2020-05-25 23:52:51 +02:00
SessionService.cs	Initial migration code	2020-05-12 22:10:35 -04:00