diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:01 +0200 |
| commit | f42a737419e41640af33ee0e2c52e7956c56e72e (patch) | |
| tree | c58989a51cd189b25a34217b7dd61caaadc19e93 /build | |
| parent | 713fe496ce0d18c321492c27a8e0301f02ddcf52 (diff) | |
| parent | 005c27e73d2cd8b6e60eaf09ebc670ce8693f3b4 (diff) | |
| download | forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.gz forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.bz2 forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.xz forums-f42a737419e41640af33ee0e2c52e7956c56e72e.zip | |
Merge branch 'prep-release-3.1.4' 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 ec6827f866..6c91827146 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.5-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}" /> |