diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-26 11:39:58 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-26 11:39:58 +0100 |
| commit | 230472de4529c4a9c0468488bee0edc6f08086c6 (patch) | |
| tree | 6c15af55b11f87c49fd1398862c410bee9edcdf2 /build | |
| parent | 2ebbcbe2331f48fc67e879caded25ebd4a0d2778 (diff) | |
| parent | 790e77de019099b977593fa7f78ac82b3bda7365 (diff) | |
| download | forums-230472de4529c4a9c0468488bee0edc6f08086c6.tar forums-230472de4529c4a9c0468488bee0edc6f08086c6.tar.gz forums-230472de4529c4a9c0468488bee0edc6f08086c6.tar.bz2 forums-230472de4529c4a9c0468488bee0edc6f08086c6.tar.xz forums-230472de4529c4a9c0468488bee0edc6f08086c6.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index b7e5e3e194..5b2a4ed3e5 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- 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.3.0-b1, 3.3.0-b2, 3.3.0-RC1" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |