diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-20 09:53:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-20 09:53:23 +0200 |
| commit | e00545588145e7d4d33cb9780673f36a6049f0eb (patch) | |
| tree | f714f24b7e681c4a2f61eff8aab3a721b36bde79 /phpBB/install | |
| parent | fc252f1ba52760a072d8e79f5afc3268db7d1035 (diff) | |
| parent | 26c6ffa458a70fa30d8bf925418ddf05cf86d1de (diff) | |
| download | forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar.gz forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar.bz2 forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar.xz forums-e00545588145e7d4d33cb9780673f36a6049f0eb.zip | |
Merge branch 'prep-release-3.1.0-RC4' into develop-ascraeus
* prep-release-3.1.0-RC4:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
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 d09f71ae22..4ec408a670 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-RC3', + 'phpbb_version' => '3.1.0-RC4', '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 90b1ac8f92..baabe90f2a 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-RC4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC5-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'); |