diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-07 22:11:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-07 22:11:14 +0200 |
| commit | 5b186c936d6d6d67b8b0551a990522fdc68e2a4c (patch) | |
| tree | af8267503ec08016417f2f6708cdd0aa93575e95 /phpBB/install | |
| parent | 63bdd193e0da90dc12ff2b6523b255f832420d3b (diff) | |
| parent | eed4d0d30f6732474d01c787c30cf7f80b584b07 (diff) | |
| download | forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar.gz forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar.bz2 forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar.xz forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.zip | |
Merge branch 'prep-release-3.1.0-RC5' into develop-ascraeus
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 4ec408a670..cab3fd7f1f 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-RC4', + 'phpbb_version' => '3.1.0-RC5', '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 baabe90f2a..adbd5a540e 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-RC5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC6-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'); |