nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-19 00:21:35 -05:00
Code Activity

Merge branch 'master' into feature/billing-obfuscation

Browse Source 
# Conflicts:
#	src/Core/Enums/ReferenceEventType.cs
#	src/Core/Services/IMailService.cs
#	src/Core/Services/Implementations/HandlebarsMailService.cs
#	src/Core/Services/Implementations/OrganizationService.cs
#	src/Core/Services/NoopImplementations/NoopMailService.cs
This commit is contained in:
Rui Tome
2023-03-31 11:31:41 +01:00
parent 570d239da9 60bdf77e8b
commit ed2c217ee6
118 changed files with 7963 additions and 4884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/AuthRequestCompare.cs
View File

@ -12,8 +12,7 @@ public class AuthRequestCompare : IEqualityComparer<AuthRequest>
x.PublicKey == y.PublicKey &&
x.RequestDeviceIdentifier == y.RequestDeviceIdentifier &&
x.RequestDeviceType == y.RequestDeviceType &&
x.RequestIpAddress == y.RequestIpAddress &&
x.RequestFingerprint == y.RequestFingerprint;
x.RequestIpAddress == y.RequestIpAddress;
}
public int GetHashCode([DisallowNull] AuthRequest obj)