diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:38:04 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:38:04 +0200 |
| commit | 7ccb19fa001cb0f76499fd19256e60df382c6d2a (patch) | |
| tree | e556f0887841680da57c308fb3e371c076345b1d /build | |
| parent | 89f7fc63e8713aa6c332dce5e77df6112af8d635 (diff) | |
| parent | 8f5d76111243fae8d2926037e8fef0cbc97802c7 (diff) | |
| download | forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.gz forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.bz2 forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.xz forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.zip | |
Merge branch 'prep-release-3.1.5' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
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 34d94af973..408eee3335 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.1.6-dev" /> - <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, 3.1.5-RC1" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |