diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:45:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:45:54 +0200 |
| commit | 947ab914737b906bb6e3a6d526c930d2356de504 (patch) | |
| tree | 254cab14a05bfd66ed5da5a85b2a45d98d995404 /phpBB/install | |
| parent | acf6eaf8a88415064db8de826b68d5b9b70e8c44 (diff) | |
| parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
| download | forums-947ab914737b906bb6e3a6d526c930d2356de504.tar forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.gz forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.bz2 forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.xz forums-947ab914737b906bb6e3a6d526c930d2356de504.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 cab3fd7f1f..983c11cc98 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-RC5', + 'phpbb_version' => '3.1.0-RC6', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |