aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-07-16 20:53:18 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-07-16 20:53:18 +0200
commit53f186d96bc6dd3c5870201562116e17d008d64b (patch)
tree5a3c7950dc56995c495d6662a66a072bf4498913 /build
parenta53c8cee79af4fc76590073ae5913d8159b97679 (diff)
parent5216bf44838f8395d27b3df4ec1641a6407cb466 (diff)
downloadforums-53f186d96bc6dd3c5870201562116e17d008d64b.tar
forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar.gz
forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar.bz2
forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar.xz
forums-53f186d96bc6dd3c5870201562116e17d008d64b.zip
Merge branch 'prep-release-3.2.1' into 3.2.x
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 995d5128d0..42f242b59d 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.2-dev" />
- <property name="prevversion" value="3.2.1-RC1" />
- <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, 3.1.9, 3.1.10, 3.1.11-RC1, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0" />
+ <property name="prevversion" value="3.2.1" />
+ <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, 3.1.9, 3.1.10, 3.1.11, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />