diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-05 22:25:45 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-05 22:25:45 +0100 |
| commit | 344baf91809bbfd5a224191e13472b94f77b421c (patch) | |
| tree | 3beda4c0c83da67a6593928d1c7c88cfe8f0317a /phpBB/install | |
| parent | 32bc5d72e424881109e0c86b716e8bd77e41bffc (diff) | |
| parent | bf93e20afb7a047dbdc848e808feac5788752ff7 (diff) | |
| download | forums-344baf91809bbfd5a224191e13472b94f77b421c.tar forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.gz forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.bz2 forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.xz forums-344baf91809bbfd5a224191e13472b94f77b421c.zip | |
Merge branch 'prep-release-3.1.0-a3' into develop
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 dd4ef13e49..c8de3d3b23 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -33,7 +33,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.0-a2', + 'phpbb_version' => '3.1.0-a3', 'author' => '<a href="https://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 8a16526f36..9f198595e0 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -269,7 +269,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-a3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a4-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'); |