diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 21:00:04 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 21:00:04 +0200 |
| commit | a3883a6f23b5036f02ccfe6ee895d4f911fa86fc (patch) | |
| tree | 3c8471157174421be5ebf3b2a96074572de4c55c /phpBB/phpbb/db | |
| parent | 9713f52fc6dd2f02800ac845533dba12061f6f29 (diff) | |
| parent | 4276962e788a0e4b111696a5d8bd69d0e2ad7df8 (diff) | |
| download | forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.gz forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.bz2 forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.xz forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.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/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v315rc1.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v315rc1.php b/phpBB/phpbb/db/migration/data/v31x/v315rc1.php new file mode 100644 index 0000000000..4cf4472aa7 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v315rc1.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 v315rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v314', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.5-RC1')), + ); + } +} |