diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 21:00:04 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 21:00:04 +0200 |
commit | a3883a6f23b5036f02ccfe6ee895d4f911fa86fc (patch) | |
tree | 3c8471157174421be5ebf3b2a96074572de4c55c /phpBB/install/convertors | |
parent | 9713f52fc6dd2f02800ac845533dba12061f6f29 (diff) | |
parent | 4276962e788a0e4b111696a5d8bd69d0e2ad7df8 (diff) | |
download | forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.gz forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.bz2 forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.xz forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.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/convertors')
-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 553d873b25..a19bb2504b 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.4', + 'phpbb_version' => '3.1.5', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |