aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-04-29 17:16:21 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-04-29 17:16:21 +0200
commitd67fdfa02bdeb80978ef1440af55ca710552b5ad (patch)
tree0e8fff4fd7decc57f64656901651ff9d8dcb549a
parent39f1e8c009e35caac4e6490e4f94333c8571f57b (diff)
parent9cd0295dd87fd8920b473a290830b58ec3a9877e (diff)
downloadforums-d67fdfa02bdeb80978ef1440af55ca710552b5ad.tar
forums-d67fdfa02bdeb80978ef1440af55ca710552b5ad.tar.gz
forums-d67fdfa02bdeb80978ef1440af55ca710552b5ad.tar.bz2
forums-d67fdfa02bdeb80978ef1440af55ca710552b5ad.tar.xz
forums-d67fdfa02bdeb80978ef1440af55ca710552b5ad.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/v314rc2.php32
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')),
+ );
+ }
+}