diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 17:53:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 17:53:16 +0200 |
| commit | a84bb5f6a137577ea92a460520ecd4a6c3895a72 (patch) | |
| tree | a220e258892308a97b447c1355d695fa56f86282 /phpBB/install | |
| parent | 300d68ff53ee6ef9c9f09f29c6770c1bc117ea77 (diff) | |
| parent | 807e000b912a30f3c8010dd7c2acdfa04f6c5392 (diff) | |
| download | forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar.gz forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar.bz2 forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar.xz forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.1.0-b4] Update phpBB Version for b5 development
[prep-release-3.1.0-b4] Add changelog for 3.1.0-b4
[prep-release-3.1.0-b4] Prepare Changelog
[prep-release-3.1.0-b4] Add migration for 3.1.0-b4
[prep-release-3.1.0-b4] Update version to 3.1.0-b4
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 0c2d4ebf74..7daacf92f4 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -37,7 +37,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-b3', + 'phpbb_version' => '3.1.0-b4', '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 7afed448ad..e335c1f9ba 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -272,7 +272,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-b4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b5-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'); |