Bill Burke 798fd84698 Merge remote-tracking branch 'upstream/master'		2016-11-21 11:33:52 -05:00
..
java/org/keycloak	Merge remote-tracking branch 'upstream/master'	2016-11-21 11:33:52 -05:00
resources/META-INF/services	KEYCLOAK-3882 Split server-spi into server-spi and server-spi-private	2016-11-10 13:28:42 +01:00