diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-02-18 18:38:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-02-18 18:38:43 +0100 |
| commit | fc66f00236230d41362dd63286641e8faffd0f99 (patch) | |
| tree | bdefdc37112be44eb36edc69e6d5d8cd7fc05f9c /build | |
| parent | 17e21d5140ccb99363a32bd64c32af6012c1ce97 (diff) | |
| parent | 9745d8d80e05f755bb8188077d042a2a69e8c21f (diff) | |
| download | forums-fc66f00236230d41362dd63286641e8faffd0f99.tar forums-fc66f00236230d41362dd63286641e8faffd0f99.tar.gz forums-fc66f00236230d41362dd63286641e8faffd0f99.tar.bz2 forums-fc66f00236230d41362dd63286641e8faffd0f99.tar.xz forums-fc66f00236230d41362dd63286641e8faffd0f99.zip | |
Merge branch 'prep-release-3.1.8' 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 29afe03011..1827fe8ab3 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.9-dev" /> - <property name="prevversion" value="3.1.7-pl1" /> - <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-RC1, 3.1.7" /> + <property name="newversion" value="3.1.8" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |