1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [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
This commit is contained in:
Andreas Fischer
2015-01-30 13:36:55 +01:00
2 changed files with 52 additions and 44 deletions

View File

@@ -4,7 +4,7 @@
<!-- a few settings for the build -->
<property name="newversion" value="3.2.0-a1-dev" />
<property name="prevversion" value="3.1.3-RC1" />
<property name="olderversions" value="3.0.12, 3.0.13, 3.1.0, 3.1.1, 3.1.2" />
<property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />