diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-26 19:01:47 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-26 19:01:47 +0100 |
| commit | 828aa34ff99cecef3442e2d28dae5734f7db6e12 (patch) | |
| tree | 9670f9eaec40ef8e483dcf4206a5f05fc6ad3d69 /build | |
| parent | 7081b3e382d83b6da466c545037096aa1c124c45 (diff) | |
| parent | 1c6ebcf02b2110556c811e8549e2079afab5ec7b (diff) | |
| download | forums-828aa34ff99cecef3442e2d28dae5734f7db6e12.tar forums-828aa34ff99cecef3442e2d28dae5734f7db6e12.tar.gz forums-828aa34ff99cecef3442e2d28dae5734f7db6e12.tar.bz2 forums-828aa34ff99cecef3442e2d28dae5734f7db6e12.tar.xz forums-828aa34ff99cecef3442e2d28dae5734f7db6e12.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
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 5e839da636..0055d08dcc 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-a1-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}" /> |