diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-12 10:17:47 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-12 10:17:47 +0200 |
| commit | 483b40dfa3b67471b1e9b912233d8a0c3c11f23c (patch) | |
| tree | a5e335a6d0c0ad446b30def9f334d49d5f57fdd5 /phpBB/install | |
| parent | a60d4b250798bfd8e974746dcb3d6b5a81f063ed (diff) | |
| parent | e47b7540c3def5635bd33614122c70f13588580c (diff) | |
| download | forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.gz forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.bz2 forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.xz forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
[prep-release-3.1.0-RC3] Prepare Changelog
[prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
[prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
Conflicts:
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 696075b07c..de0cccd234 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.0-RC2', + 'phpbb_version' => '3.1.0-RC3', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5589e10243..37e1c8de50 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC4-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); |