Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
AuthorizationContext.cs	Initial migration code	2020-05-12 22:10:35 -04:00
AuthService.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
SessionContext.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00