aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-06-14 17:40:18 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-06-14 17:40:18 +0200
commit2a662c5e07cdf14410bdc3cc48250443dfdeb269 (patch)
tree56a5ce0b804d8a2428e91e77b083fa7afb2b1a33 /build
parent2eceaaddf68d0d1f1dca741d49386e889cf1cc4e (diff)
parent7ccb19fa001cb0f76499fd19256e60df382c6d2a (diff)
downloadforums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar
forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.gz
forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.bz2
forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.xz
forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.zip
Merge branch '3.1.x'
Conflicts: build/build.xml phpBB/phpbb/user.php
Diffstat (limited to 'build')
-rw-r--r--build/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml
index 3e445196ef..eb5e9bcfb7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -3,8 +3,8 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
<property name="newversion" value="3.2.0-a1-dev" />
- <property name="prevversion" value="3.1.4" />
- <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.5-RC1" />
+ <property name="prevversion" value="3.1.5" />
+ <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />