diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:42:07 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:42:07 +0100 |
| commit | fd5e66cbf11ac3e49007369ece339bc937517d93 (patch) | |
| tree | b625c33c00c30ce65d72c79f9b3fc68f5c8f038a /build | |
| parent | d64680983a5fa06a737a1ae7e164cb7f67a5a53c (diff) | |
| parent | 85e98a9d702cf179dc09a6ad077fac23bb28ae38 (diff) | |
| download | forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.gz forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.bz2 forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.xz forums-fd5e66cbf11ac3e49007369ece339bc937517d93.zip | |
Merge branch 'prep-release-3.1.7' 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 b8a88473ba..b9002f5744 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.8-dev" /> - <property name="prevversion" value="3.1.7" /> - <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" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |