diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:45:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:45:32 +0100 |
| commit | 7f7b09fdeb087ed826bf5216fa271f2dd65c52e6 (patch) | |
| tree | 63a747494d59ce4dd2fbfb4742f2f90ac9b3790f /build | |
| parent | b2324607ad7d23450aafddbf6fb286fa05e3a9d5 (diff) | |
| parent | fd5e66cbf11ac3e49007369ece339bc937517d93 (diff) | |
| download | forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.gz forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.bz2 forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.xz forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 79cbdf79e4..f517b679cf 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-a3-dev" /> <property name="prevversion" value="3.2.0-a1" /> - <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" /> + <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}" /> |