diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 10:48:43 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 10:48:43 +0100 |
| commit | 3ae016954212e90032a10d1427c34a4ff9d9637c (patch) | |
| tree | 984936f6d9c93958cac2dd4b83103eaf4cdf0907 /build | |
| parent | 2a939fa779059b2eedc5eaf33706b4a1627ed30e (diff) | |
| parent | 0c3f7c6c8e352a73dacc1ff21a2b39a556ea6deb (diff) | |
| download | forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.gz forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.bz2 forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.xz forums-3ae016954212e90032a10d1427c34a4ff9d9637c.zip | |
Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index e748aabdb7..92c3860192 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.2.3-dev" /> - <property name="prevversion" value="3.2.2-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, 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, 3.2.1" /> + <property name="newversion" value="3.2.2" /> + <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, 3.2.2-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |