diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-30 23:01:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-30 23:01:27 +0200 |
| commit | a618710a69cf797d2b64a3567b2d2da327cddc25 (patch) | |
| tree | 566b60106dea46146039a27e908fa7aceed62401 /phpBB/install | |
| parent | acb4d90371cfa2682e74e38c8e3bef087ace7600 (diff) | |
| parent | 45f2efea19280092da2d58f506c56aee4a998a9d (diff) | |
| download | forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.gz forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.bz2 forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.xz forums-a618710a69cf797d2b64a3567b2d2da327cddc25.zip | |
Merge branch 'prep-release-3.1.0-b2' into develop-ascraeus
* prep-release-3.1.0-b2:
[prep-release-3.1.0-b2] Prepare development of 3.1.0-b3
[prep-release-3.1.0-b2] Add changelog for 3.1.0-b2
[prep-release-3.1.0-b2] Prepare Changelog
[prep-release-3.1.0-b2] Add migration for 3.1.0-b2
[prep-release-3.1.0-b2] Update version to 3.1.0-b2
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 e8c8a7431d..926f139da4 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-b1', + 'phpbb_version' => '3.1.0-b2', '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 885093f1ed..4b1a369861 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-b2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b3-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'); |