diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:40:18 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:40:18 +0200 |
| commit | 2a662c5e07cdf14410bdc3cc48250443dfdeb269 (patch) | |
| tree | 56a5ce0b804d8a2428e91e77b083fa7afb2b1a33 /phpBB/phpbb/db | |
| parent | 2eceaaddf68d0d1f1dca741d49386e889cf1cc4e (diff) | |
| parent | 7ccb19fa001cb0f76499fd19256e60df382c6d2a (diff) | |
| download | forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.gz forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.bz2 forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.xz forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/phpbb/user.php
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v315.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v315.php b/phpBB/phpbb/db/migration/data/v31x/v315.php new file mode 100644 index 0000000000..778cdf717e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v315.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 v315 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v315rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.5')), + ); + } +} |