diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:34:40 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:34:40 +0100 |
| commit | b6786f8ba10434603e630f0962dcf6384ade32a0 (patch) | |
| tree | b0879ba78fefae3229efd86161f7fc96e75b791b /build | |
| parent | c130165bfa06412752836e8715602836c18874d5 (diff) | |
| parent | 5f237a042605f46e1fa9546b2ccf6916687f5820 (diff) | |
| download | forums-b6786f8ba10434603e630f0962dcf6384ade32a0.tar forums-b6786f8ba10434603e630f0962dcf6384ade32a0.tar.gz forums-b6786f8ba10434603e630f0962dcf6384ade32a0.tar.bz2 forums-b6786f8ba10434603e630f0962dcf6384ade32a0.tar.xz forums-b6786f8ba10434603e630f0962dcf6384ade32a0.zip | |
Merge branch 'prep-release-3.0.13' into prep-release-3.1.3
* prep-release-3.0.13:
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
[prep-release-3.0.13] Also update version in references to files.
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
[prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
[prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
[ticket/12933] Handle case when * is last character of word
[ticket/13554] Show feature release upgrades in blue rather than red.
Conflicts:
build/build.xml
phpBB/adm/style/acp_update.html
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/includes/startup.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
tests/security/trailing_path_test.php
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 ecca324910..a8d34d3db1 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.3-RC1" /> <property name="prevversion" value="3.1.2" /> - <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" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 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}" /> |