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 |
||
---|---|---|
.. | ||
file | ||
http-client | ||
infinispan | ||
jpa | ||
jpa-liquibase | ||
mongo | ||
mongo-update | ||
pom.xml |