diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-09-05 15:20:38 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-09-05 15:20:38 +0200 |
| commit | fb3e9d9a771e3e46ba1ccc0b93b6ba7425ebce7b (patch) | |
| tree | 5b1decd5773c7caa4bb92819b476015a5862280e /build | |
| parent | 615ed729b5b54f2f143d10136619b5c4519b353b (diff) | |
| parent | f201c22ca783f3652a81f05f4daddba53c13b499 (diff) | |
| download | forums-fb3e9d9a771e3e46ba1ccc0b93b6ba7425ebce7b.tar forums-fb3e9d9a771e3e46ba1ccc0b93b6ba7425ebce7b.tar.gz forums-fb3e9d9a771e3e46ba1ccc0b93b6ba7425ebce7b.tar.bz2 forums-fb3e9d9a771e3e46ba1ccc0b93b6ba7425ebce7b.tar.xz forums-fb3e9d9a771e3e46ba1ccc0b93b6ba7425ebce7b.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
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 eb5e9bcfb7..2fe39bbf13 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.0-a1-dev" /> - <property name="prevversion" value="3.1.5" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4" /> + <property name="prevversion" value="3.1.6" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |