diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-01 20:24:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-01 20:24:32 +0100 |
| commit | 6e2838a4cabc6e7874ff1a72af2d3eb4f5361428 (patch) | |
| tree | df1c4c097397824f33e9be21ca7ef4b7e2a948dc | |
| parent | a893dfa46bc66b23c9dccea9320e1957575c48d6 (diff) | |
| parent | 9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec (diff) | |
| download | forums-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.tar forums-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.tar.gz forums-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.tar.bz2 forums-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.tar.xz forums-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v313.php | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index b799af1a99..d2e9618ef8 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,7 +3,7 @@ <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.3-RC2" /> + <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" /> <!-- no configuration should be needed beyond this point --> diff --git a/phpBB/phpbb/db/migration/data/v31x/v313.php b/phpBB/phpbb/db/migration/data/v31x/v313.php new file mode 100644 index 0000000000..5a4e21a9b7 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v313.php @@ -0,0 +1,31 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v313 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v313rc2', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.3')), + ); + } +} |