diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-11-02 01:29:04 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-11-02 01:29:04 +0100 |
| commit | 29d2a7bc9f0afd074fd0b4afdf9015a70bd06940 (patch) | |
| tree | 9cd85a9e108232a9b581199c9003600a22766c46 /phpBB/install | |
| parent | 9908f8e3eac3d662bcf49e9bf543f8c89cd48dc8 (diff) | |
| parent | 0e772afb9db640e54e84cfccaddcf74f3edbb3fb (diff) | |
| download | forums-29d2a7bc9f0afd074fd0b4afdf9015a70bd06940.tar forums-29d2a7bc9f0afd074fd0b4afdf9015a70bd06940.tar.gz forums-29d2a7bc9f0afd074fd0b4afdf9015a70bd06940.tar.bz2 forums-29d2a7bc9f0afd074fd0b4afdf9015a70bd06940.tar.xz forums-29d2a7bc9f0afd074fd0b4afdf9015a70bd06940.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/memberlist_email.html
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 8f6af30426..effd72aeff 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', + 'phpbb_version' => '3.1.1', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, |