diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:45:54 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:45:54 +0200 |
commit | 947ab914737b906bb6e3a6d526c930d2356de504 (patch) | |
tree | 254cab14a05bfd66ed5da5a85b2a45d98d995404 /phpBB/phpbb/db | |
parent | acf6eaf8a88415064db8de826b68d5b9b70e8c44 (diff) | |
parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
download | forums-947ab914737b906bb6e3a6d526c930d2356de504.tar forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.gz forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.bz2 forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.xz forums-947ab914737b906bb6e3a6d526c930d2356de504.zip |
Merge branch 'develop-ascraeus' into develop
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 'phpBB/phpbb/db')
-rw-r--r-- | phpBB/phpbb/db/migration/data/v310/rc6.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/rc6.php b/phpBB/phpbb/db/migration/data/v310/rc6.php new file mode 100644 index 0000000000..b84f2edcc9 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc6.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\v310; + +class rc6 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc5', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC6')), + ); + } +} |