aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-31 12:12:56 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-31 12:12:56 +0100
commitbacb38b1615b6d65f4d5494ff243783a46365a4e (patch)
tree4c5bbc04ffe96c3d7a56525b03a665634593e495 /phpBB/phpbb/db
parentc14cf0457dedfd0c1a8a72dc0571e60ccb8b03f6 (diff)
parent3c23242bfe8666cfa7fb3ae6b55c2190f397c773 (diff)
downloadforums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar
forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.gz
forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.bz2
forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.xz
forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/v313rc2.php32
1 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v313rc2.php b/phpBB/phpbb/db/migration/data/v31x/v313rc2.php
new file mode 100644
index 0000000000..d832d6f502
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/v313rc2.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 v313rc2 extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v30x\release_3_0_13_pl1',
+ '\phpbb\db\migration\data\v31x\v313rc1',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.1.3-RC2')),
+ );
+ }
+}