diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-08-23 18:27:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-08-23 18:27:30 +0200 |
| commit | 05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42 (patch) | |
| tree | 4de24c52bc5c7aad8b90ea67f3d85374d01a6aa0 /phpBB/install | |
| parent | eb53e51e3692589c9152f03ab3b4fb85b74cdfa5 (diff) | |
| parent | 335452b1c162b74905b8459feb2f4d4ec9e31444 (diff) | |
| download | forums-05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42.tar forums-05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42.tar.gz forums-05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42.tar.bz2 forums-05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42.tar.xz forums-05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42.zip | |
Merge branch '3.1.x'
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 a19bb2504b..e75cb4622f 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.5', + 'phpbb_version' => '3.1.6', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |