diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:43:32 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:43:32 +0200 |
| commit | cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32 (patch) | |
| tree | 8718af3fab56737b4f50b99250d4665684303d82 /build | |
| parent | af3cde98f44967a4c9f881f5abfc8b8ea329ea27 (diff) | |
| parent | dde72c58b087c390c36ab12ba9e371f9fb0b2dfc (diff) | |
| download | forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar.gz forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar.bz2 forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar.xz forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.zip | |
Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
[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.
Conflicts:
build/build.xml
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 823f57206d..ec6827f866 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.5-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}" /> |