diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-20 09:55:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-20 09:55:56 +0200 |
| commit | e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb (patch) | |
| tree | 270b71ee7d5213cdc40e9c02d22d51877b1b8b58 /phpBB/install | |
| parent | 0a6015ad4b3a0f0cb3528edc7836099f9d89fec4 (diff) | |
| parent | e00545588145e7d4d33cb9780673f36a6049f0eb (diff) | |
| download | forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar.gz forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar.bz2 forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar.xz forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
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 d09f71ae22..4ec408a670 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-RC3', + 'phpbb_version' => '3.1.0-RC4', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |