diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-26 19:01:34 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-26 19:01:34 +0100 |
| commit | 1c6ebcf02b2110556c811e8549e2079afab5ec7b (patch) | |
| tree | 9a5473407a7785276478e93130e0f3e7779d2caf /build | |
| parent | ffbe8cdc96004c17d57e40b8d66375b01cf01a14 (diff) | |
| parent | ebd5aace3fd556d6b588b07329a7eed37997045b (diff) | |
| download | forums-1c6ebcf02b2110556c811e8549e2079afab5ec7b.tar forums-1c6ebcf02b2110556c811e8549e2079afab5ec7b.tar.gz forums-1c6ebcf02b2110556c811e8549e2079afab5ec7b.tar.bz2 forums-1c6ebcf02b2110556c811e8549e2079afab5ec7b.tar.xz forums-1c6ebcf02b2110556c811e8549e2079afab5ec7b.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
Conflicts:
build/build.xml
phpBB/install/database_update.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 4d16ad1b6a..d65056f325 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.1.3-RC1-dev" /> <property name="prevversion" value="3.1.2" /> - <property name="olderversions" value="3.0.12, 3.0.13-RC1, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3, 3.1.0-RC4, 3.1.0-RC5, 3.1.0-RC6, 3.1.0, 3.1.1, 3.1.2-RC1" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3, 3.1.0-RC4, 3.1.0-RC5, 3.1.0-RC6, 3.1.0, 3.1.1, 3.1.2-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |