diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:40:44 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:40:44 +0100 |
| commit | 727359156062b49c1b9da75bde6dda8038a7069b (patch) | |
| tree | 18d37df11ed34d8d3df221f3ebef851b5cf923f3 /build | |
| parent | cc210b1842f8f951dd9578d582fb40f0159cead7 (diff) | |
| parent | 5f237a042605f46e1fa9546b2ccf6916687f5820 (diff) | |
| download | forums-727359156062b49c1b9da75bde6dda8038a7069b.tar forums-727359156062b49c1b9da75bde6dda8038a7069b.tar.gz forums-727359156062b49c1b9da75bde6dda8038a7069b.tar.bz2 forums-727359156062b49c1b9da75bde6dda8038a7069b.tar.xz forums-727359156062b49c1b9da75bde6dda8038a7069b.zip | |
Merge branch 'prep-release-3.0.13' into develop-olympus
* 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.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index fd3593b69d..b5fe185530 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,8 +3,8 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.0.14-dev" /> - <property name="prevversion" value="3.0.13" /> - <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12" /> + <property name="prevversion" value="3.0.13-PL1" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12, 3.0.13" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |