Patrick Barron a225f34796 Merge branch 'master' into authenticationdb-efcore ... # Conflicts: # Jellyfin.Api/Helpers/RequestHelpers.cs		2021-05-18 18:09:46 -04:00
..
DefaultAuthenticationProvider.cs	Enable nullable for Jellyfin.Server.Implementations	2020-12-12 11:20:48 -05:00
DefaultPasswordResetProvider.cs	FxCop -> Net Analyzers (part 2)	2021-03-13 22:33:28 +01:00
DeviceAccessEntryPoint.cs	Enable nullable for Jellyfin.Server.Implementations	2020-12-12 11:20:48 -05:00
DisplayPreferencesManager.cs	make custompref value nullable	2021-04-07 13:09:00 +02:00
InvalidAuthProvider.cs	Enable nullable for Jellyfin.Server.Implementations	2020-12-12 11:20:48 -05:00
UserManager.cs	Merge branch 'master' into authenticationdb-efcore	2021-05-18 18:09:46 -04:00