d00e0021b6
Conflicts: connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java |
||
---|---|---|
.. | ||
account-api | ||
account-freemarker | ||
common-freemarker | ||
common-themes | ||
email-api | ||
email-freemarker | ||
login-api | ||
login-freemarker | ||
pom.xml |