diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:32:36 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:40:23 +0200 |
| commit | 969718fc91cc2343332d0b89d9e842a8a1c2c1d3 (patch) | |
| tree | 49578dfe84d2326f10476dc330e01dbd03acff65 /build | |
| parent | eae592691c200490cb8152722dddb7bd12da5207 (diff) | |
| parent | d833f290694e7545c0c4168cbf6c565bd52c43ba (diff) | |
| download | forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar.gz forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar.bz2 forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar.xz forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.zip | |
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
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 7628e69f2d..26eb2edf44 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-RC1" /> <property name="prevversion" value="3.1.3" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 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-RC1, 3.1.0, 3.1.1, 3.1.2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |