diff options
author | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:14:33 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 13:14:33 +0100 |
commit | b78ae290e86d1789a293580c1db2c932876d194c (patch) | |
tree | 956fb9d329585eb12f4dce92bf688f07a4a0dae9 /phpBB/install/convertors | |
parent | 1642e560dcc1625c4d52f265a98825e4b81c12c3 (diff) | |
parent | ab07be81573c155d46dcb739a3811b1e958139a5 (diff) | |
download | forums-b78ae290e86d1789a293580c1db2c932876d194c.tar forums-b78ae290e86d1789a293580c1db2c932876d194c.tar.gz forums-b78ae290e86d1789a293580c1db2c932876d194c.tar.bz2 forums-b78ae290e86d1789a293580c1db2c932876d194c.tar.xz forums-b78ae290e86d1789a293580c1db2c932876d194c.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13553] Add a method to the controller helper to display a message
[prep-release-3.1.3] Add changelog for 3.1.3-RC1
[prep-release-3.1.3] Prepare Changelog
[prep-release-3.1.3] Add migration for 3.1.3-RC1
[prep-release-3.1.3] Update version to 3.1.2-RC1
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 da53d2c143..511f850679 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.2', + 'phpbb_version' => '3.1.3', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |