Stian Thorgersen 216e24864a Merge branch 'ldap' of https://github.com/mposolda/keycloak into mposolda-ldap ...

Conflicts:
	admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
	admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js

2014-04-04 15:29:03 +01:00

..

src

Merge branch 'ldap' of https://github.com/mposolda/keycloak into mposolda-ldap

2014-04-04 15:29:03 +01:00

pom.xml

Merge pull request #309 from vibe13/master

2014-04-02 11:39:04 -04:00