Commit 0d893d8d authored by akrherz's avatar akrherz

Move 3.10 branch onto 3.10.2-alpha

parent 77ba6394
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
<property name="version.major" value="3"/> <property name="version.major" value="3"/>
<property name="version.minor" value="10"/> <property name="version.minor" value="10"/>
<property name="version.revision" value="1"/> <property name="version.revision" value="2"/>
<property name="version.extra" value=""/> <!-- For 'alpha', 'beta', or 'rc' --> <property name="version.extra" value="alpha"/> <!-- For 'alpha', 'beta', or 'rc' -->
<property name="javac.source" value="1.7"/> <property name="javac.source" value="1.7"/>
<property name="javac.target" value="1.7"/> <property name="javac.target" value="1.7"/>
......
...@@ -362,7 +362,7 @@ public class XMPPServer { ...@@ -362,7 +362,7 @@ public class XMPPServer {
host = "127.0.0.1"; host = "127.0.0.1";
} }
version = new Version(3, 10, 1, Version.ReleaseStatus.Release, -1); version = new Version(3, 10, 2, Version.ReleaseStatus.Alpha, -1);
if ("true".equals(JiveGlobals.getXMLProperty("setup"))) { if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
setupMode = false; setupMode = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment