diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-07 22:12:37 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-07 22:12:37 +0200 |
| commit | 9d6cef2225f704bbaee40b21d4ef74a112285016 (patch) | |
| tree | cc5aefce5c6389b9331d667a3075ec1bb1b8dbab /phpBB/install | |
| parent | 10e99b018a6ecd43f1ffdfafb67b2e4303fd19b1 (diff) | |
| parent | 5b186c936d6d6d67b8b0551a990522fdc68e2a4c (diff) | |
| download | forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.gz forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.bz2 forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.xz forums-9d6cef2225f704bbaee40b21d4ef74a112285016.zip | |
Merge branch 'develop-ascraeus' into develop
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 4ec408a670..cab3fd7f1f 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-RC4', + 'phpbb_version' => '3.1.0-RC5', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |