diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-10 10:06:07 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-10 10:06:07 +0200 |
| commit | bf107ba1af0f40471c1eecb86ce2e0cfae332ac1 (patch) | |
| tree | 214b7217f15319a96abc23080e6b359386f613fd /phpBB/phpbb | |
| parent | afc3730cca995fdfaab45318581a85256bc84f98 (diff) | |
| parent | a151ad912a21e9f7ba4d5ef3bbee32b725cd1c5d (diff) | |
| download | forums-bf107ba1af0f40471c1eecb86ce2e0cfae332ac1.tar forums-bf107ba1af0f40471c1eecb86ce2e0cfae332ac1.tar.gz forums-bf107ba1af0f40471c1eecb86ce2e0cfae332ac1.tar.bz2 forums-bf107ba1af0f40471c1eecb86ce2e0cfae332ac1.tar.xz forums-bf107ba1af0f40471c1eecb86ce2e0cfae332ac1.zip | |
Merge branch '3.1.x'
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')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v314rc1.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v314rc1.php b/phpBB/phpbb/db/migration/data/v31x/v314rc1.php new file mode 100644 index 0000000000..10cdbe3f9c --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v314rc1.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 v314rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v313', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.4-RC1')), + ); + } +} |