diff options
| author | GanstaZ <ganstaz@hotmail.com> | 2018-12-22 22:26:54 +0200 |
|---|---|---|
| committer | GanstaZ <ganstaz@hotmail.com> | 2018-12-22 22:26:54 +0200 |
| commit | c6f613bae55be0f2aab855d58ca7fbcaa643c626 (patch) | |
| tree | ed1488880d384efc3ddd3192a24239afcd8d9ab6 /build | |
| parent | 349ab42fdc994c5fa16436bd2d82df0ef4019f16 (diff) | |
| parent | 70a56c208fa5bcdde9337c871b30aaaf7e5602b8 (diff) | |
| download | forums-c6f613bae55be0f2aab855d58ca7fbcaa643c626.tar forums-c6f613bae55be0f2aab855d58ca7fbcaa643c626.tar.gz forums-c6f613bae55be0f2aab855d58ca7fbcaa643c626.tar.bz2 forums-c6f613bae55be0f2aab855d58ca7fbcaa643c626.tar.xz forums-c6f613bae55be0f2aab855d58ca7fbcaa643c626.zip | |
Merge branch '3.2.x' into ticket/15914
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 d746cba18d..dc9f3bbe0d 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.6-dev" /> - <property name="prevversion" value="3.2.4" /> - <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" /> + <property name="prevversion" value="3.2.5" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |