diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:45:10 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:45:10 +0200 |
| commit | 9074738a10ed9108b4fb79272df148e9e9045bcb (patch) | |
| tree | 5b746621959ab1e9378dee17f4801da97bf6983e /build | |
| parent | 85967425795773b7cb4116bb05adef810fb8bc07 (diff) | |
| parent | 713fe496ce0d18c321492c27a8e0301f02ddcf52 (diff) | |
| download | forums-9074738a10ed9108b4fb79272df148e9e9045bcb.tar forums-9074738a10ed9108b4fb79272df148e9e9045bcb.tar.gz forums-9074738a10ed9108b4fb79272df148e9e9045bcb.tar.bz2 forums-9074738a10ed9108b4fb79272df148e9e9045bcb.tar.xz forums-9074738a10ed9108b4fb79272df148e9e9045bcb.zip | |
Merge branch '3.1.x'
* 3.1.x:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
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 789e184028..3c5d477eb9 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.3" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14-RC1, 3.1.0, 3.1.1, 3.1.2" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |