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

..

src/main

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

2013-12-11 14:47:18 +00:00

pom.xml

version bump to SNAPSHOT

2013-12-06 09:45:08 -05:00