diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-11 17:23:53 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-11 17:23:53 +0200 |
| commit | 0d6fe203729cdade106e21383c3faa5f71b378ce (patch) | |
| tree | f214fa7a86aeedf0dd8ecaab4b4e9a35ca5425ee /phpBB/install | |
| parent | dd78b564e56152be559b4ec476e35698fa32e1bf (diff) | |
| parent | b5492a07da70be20ce64f9f9c080f58089b5ca9a (diff) | |
| download | forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar.gz forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar.bz2 forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar.xz forums-0d6fe203729cdade106e21383c3faa5f71b378ce.zip | |
Merge branch 'prep-release-3.1.0-RC2' into develop-ascraeus
* prep-release-3.1.0-RC2:
[prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
[prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
[prep-release-3.1.0-RC2] Prepare Changelog
[prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
[prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
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 4c6fa46190..696075b07c 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-RC1', + 'phpbb_version' => '3.1.0-RC2', '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 572720ff95..9cc151f728 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-RC2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC3-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'); |