Stian Thorgersen a144ab07f2 Merge branch 'master' of https://github.com/cardosogabriel/keycloak into cardosogabriel-master ... Conflicts: forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css		2013-12-11 14:47:18 +00:00
..
resources/admin-ui	Merge branch 'master' of https://github.com/cardosogabriel/keycloak into cardosogabriel-master	2013-12-11 14:47:18 +00:00
web-fragment.xml	jpa backend	2013-11-05 21:26:33 -05:00