Stian Thorgersen a2c4a1f760 Merge branch 'KEYCLOAK-1113' of https://github.com/velias/keycloak into velias-KEYCLOAK-1113 ... Conflicts: services/src/main/java/org/keycloak/services/resources/LoginActionsService.java		2015-04-01 09:45:13 +02:00
..
src	Merge branch 'KEYCLOAK-1113' of https://github.com/velias/keycloak into velias-KEYCLOAK-1113	2015-04-01 09:45:13 +02:00
pom.xml	Updated BC provider versions and deprecated CertificateUtil methods.	2015-02-10 18:44:54 +05:30