diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:14:33 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:14:33 +0100 |
| commit | b78ae290e86d1789a293580c1db2c932876d194c (patch) | |
| tree | 956fb9d329585eb12f4dce92bf688f07a4a0dae9 /build | |
| parent | 1642e560dcc1625c4d52f265a98825e4b81c12c3 (diff) | |
| parent | ab07be81573c155d46dcb739a3811b1e958139a5 (diff) | |
| download | forums-b78ae290e86d1789a293580c1db2c932876d194c.tar forums-b78ae290e86d1789a293580c1db2c932876d194c.tar.gz forums-b78ae290e86d1789a293580c1db2c932876d194c.tar.bz2 forums-b78ae290e86d1789a293580c1db2c932876d194c.tar.xz forums-b78ae290e86d1789a293580c1db2c932876d194c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13553] Add a method to the controller helper to display a message
[prep-release-3.1.3] Add changelog for 3.1.3-RC1
[prep-release-3.1.3] Prepare Changelog
[prep-release-3.1.3] Add migration for 3.1.3-RC1
[prep-release-3.1.3] Update version to 3.1.2-RC1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
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 0055d08dcc..06ddd27476 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.2.0-a1-dev" /> - <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="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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |