mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* 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
This commit is contained in:
Andreas Fischer
2015-01-30 13:14:33 +01:00
parent 1642e560dc ab07be8157
commit b78ae290e8
5 changed files with 191 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/install/convertors/convert_phpbb20.php
View File

@@ -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,