diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-29 17:15:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-29 17:15:56 +0200 |
| commit | 9cd0295dd87fd8920b473a290830b58ec3a9877e (patch) | |
| tree | 44699b6ea75b95115f107edd4a0c4ae1ce3a693a | |
| parent | 95add752b74bf8c24f88e81799aa0f43341ea90b (diff) | |
| parent | 1ad09d9c8b40310698648e1064f186c2670ad880 (diff) | |
| download | forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar.gz forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar.bz2 forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar.xz forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.zip | |
Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v314rc2.php | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v314rc2.php b/phpBB/phpbb/db/migration/data/v31x/v314rc2.php new file mode 100644 index 0000000000..b75b7a9be8 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v314rc2.php @@ -0,0 +1,32 @@ +<?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 v314rc2 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v30x\release_3_0_14_rc1', + '\phpbb\db\migration\data\v31x\v314rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.4-RC2')), + ); + } +} |