diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:34 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:34 +0200 |
| commit | 36abb61d39c09ecc00714f4121f4738c05a9ed2e (patch) | |
| tree | 8efc1911d1c2d9e0bec6ee8ea4429ab158324338 /build | |
| parent | 9074738a10ed9108b4fb79272df148e9e9045bcb (diff) | |
| parent | f42a737419e41640af33ee0e2c52e7956c56e72e (diff) | |
| download | forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar.gz forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar.bz2 forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar.xz forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.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 3c5d477eb9..cf617952d0 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.3" /> - <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" /> + <property name="prevversion" value="3.1.4" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |