aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-10-12 21:40:59 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-10-12 21:40:59 +0200
commit1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31 (patch)
treea0dc5c3f4884c47ba7d3e426400540842b2802bb /build
parent1ad64f89b817a42722b522f4a763424eea3b5a5f (diff)
parent40354f1f909168ffafc332b74af15f9347c4e530 (diff)
downloadforums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.gz
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.bz2
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.xz
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.zip
Merge branch 'prep-release-3.1.10' into 3.1.x
Diffstat (limited to 'build')
-rw-r--r--build/build.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml
index 100795663b..cc29aec654 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,7 +2,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.1.11-dev" />
+ <property name="newversion" value="3.1.10" />
<property name="prevversion" value="3.1.9" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8" />
<!-- no configuration should be needed beyond this point -->