mirror of
https://github.com/keycloak/keycloak.git
synced 2026-02-06 07:19:01 -06:00
Conflicts:
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java
(cherry picked from commit 338fe2ae47)