diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-02-18 18:42:39 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-02-18 18:42:39 +0100 |
| commit | ab6e0bbef98a4071819bf23c79dfff28b50407ae (patch) | |
| tree | b48670188fe17f57e508cd9e074daaa53a8fc2b3 /build | |
| parent | 1007dea1541db083552e0e7d0a2541c6b8daaf5b (diff) | |
| parent | fc66f00236230d41362dd63286641e8faffd0f99 (diff) | |
| download | forums-ab6e0bbef98a4071819bf23c79dfff28b50407ae.tar forums-ab6e0bbef98a4071819bf23c79dfff28b50407ae.tar.gz forums-ab6e0bbef98a4071819bf23c79dfff28b50407ae.tar.bz2 forums-ab6e0bbef98a4071819bf23c79dfff28b50407ae.tar.xz forums-ab6e0bbef98a4071819bf23c79dfff28b50407ae.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
build/build.xml
phpBB/composer.lock
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 6d5b652b0a..b31f36cae0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-b2-dev" /> <property name="prevversion" value="3.2.0-b1" /> - <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.2.0-a1, 3.2.0-a2" /> + <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.2.0-a1, 3.2.0-a2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |