Stian Thorgersen d00e0021b6 Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master ...

Conflicts:
	connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
	services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java

2015-05-11 13:36:30 +02:00

..

src

Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master

2015-05-11 13:36:30 +02:00

pom.xml

Version bump

2015-05-05 11:45:21 +02:00