diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:45:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:45:32 +0100 |
| commit | 7f7b09fdeb087ed826bf5216fa271f2dd65c52e6 (patch) | |
| tree | 63a747494d59ce4dd2fbfb4742f2f90ac9b3790f /phpBB/phpbb | |
| parent | b2324607ad7d23450aafddbf6fb286fa05e3a9d5 (diff) | |
| parent | fd5e66cbf11ac3e49007369ece339bc937517d93 (diff) | |
| download | forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.gz forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.bz2 forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.xz forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v317pl1.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v317pl1.php b/phpBB/phpbb/db/migration/data/v31x/v317pl1.php new file mode 100644 index 0000000000..2e1b0e9b9d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v317pl1.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 v317pl1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v317', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.7-pl1')), + ); + } +} |