diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:39:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:39:51 +0200 |
| commit | dde72c58b087c390c36ab12ba9e371f9fb0b2dfc (patch) | |
| tree | 9203b70f96092d26be6c0bc8a85c97fbf6e07aca /build | |
| parent | 1ad09d9c8b40310698648e1064f186c2670ad880 (diff) | |
| parent | 11242dd07d6359a725f22f3674028adfdddb49d6 (diff) | |
| download | forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar.gz forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar.bz2 forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar.xz forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.zip | |
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
[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
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
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 9bee870d50..0fb887dd25 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.4-RC2" /> <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, 3.1.4-RC1" /> + <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, 3.1.4-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |