Rebase with master

2015-01-15 20:29:34 +01:00
1 parent ad31b3dd2e
commit 522e24017c
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.1.0.Final-SNAPSHOT</version>
+        <version>1.2.0.Beta1-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>