diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-25 19:44:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-25 19:46:24 +0200 |
| commit | f6d8183f4724808e5bc9ef1f545ddf79358adcbe (patch) | |
| tree | 6697ba66f191587f87fdc67ef5b4cd00fac6b462 /phpBB/install | |
| parent | 947ab914737b906bb6e3a6d526c930d2356de504 (diff) | |
| parent | 103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e (diff) | |
| download | forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar.gz forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar.bz2 forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar.xz forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13208] Add security issues to the final changelog
[prep-release-3.1.0] Prepare Changelog
[prep-release-3.1.0] Update version to 3.1.0
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 983c11cc98..8f6af30426 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-RC6', + 'phpbb_version' => '3.1.0', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |