diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-04 14:21:58 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-04 21:51:44 +0100 |
| commit | 1b8193ab8b2c73d4a38520c206816817db168447 (patch) | |
| tree | 7f0842d90b52cb926d15cc1df1dde77a2972d586 /build | |
| parent | b83de54bb4fd3217b41f61de896e73732752d196 (diff) | |
| parent | ed9cbc89c19bc6321bfdd540f241683b71ea9a6e (diff) | |
| download | forums-1b8193ab8b2c73d4a38520c206816817db168447.tar forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.gz forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.bz2 forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.xz forums-1b8193ab8b2c73d4a38520c206816817db168447.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 5b2a4ed3e5..ea137f50bc 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.3.0-RC2-dev" /> - <property name="prevversion" value="3.2.8" /> - <property name="olderversions" value="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.1.12, 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, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.9-RC1, 3.3.0-b1, 3.3.0-b2, 3.3.0-RC1" /> + <property name="prevversion" value="3.2.9" /> + <property name="olderversions" value="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.1.12, 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, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.3.0-b1, 3.3.0-b2, 3.3.0-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |