Michael Gerber efd912959b Merge remote-tracking branch 'upstream/master' into i18n ...

Conflicts:
	core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java

2015-02-25 18:07:50 +01:00

..

src

Merge remote-tracking branch 'upstream/master' into i18n

2015-02-25 18:07:50 +01:00

pom.xml

Updated BC provider versions and deprecated CertificateUtil methods.

2015-02-10 18:44:54 +05:30