Bill Burke 62f8811a46 Merge remote-tracking branch 'upstream/master' ... Conflicts: bundled-war-example/src/main/java/org/keycloak/server/KeycloakServerApplication.java bundled-war-example/src/main/webapp/WEB-INF/web.xml		2014-04-28 18:04:50 -04:00
..
src	Merge remote-tracking branch 'upstream/master'	2014-04-28 18:04:50 -04:00
pom.xml	remove transitive dependencies	2014-04-10 11:29:47 -04:00