Skip to content

Commit 76af19a

Browse files
Merge remote-tracking branch 'origin/improved-error-message-password-encoder' into improved-error-message-password-encoder
# Conflicts: # core/src/test/java/org/springframework/security/provisioning/InMemoryUserDetailsManagerTests.java # crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java # crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java
2 parents 08b0ae0 + 7e29776 commit 76af19a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

core/src/test/java/org/springframework/security/provisioning/InMemoryUserDetailsManagerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)