1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

Merge branch 'ticket/14339' into ticket/14339-master

Conflicts:
	phpBB/composer.json
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
This commit is contained in:
Marc Alexander
2015-12-07 21:33:59 +01:00
3 changed files with 3 additions and 3 deletions

View File

@@ -147,7 +147,7 @@
<li>Oracle</li>
</ul>
</li>
<li><strong>PHP 5.4.0+</strong> with support for the database you intend to use.</li>
<li><strong>PHP 5.4.0+</strong> and <strong>PHP < 7.1</strong> with support for the database you intend to use.</li>
<li>The following PHP modules are required:
<ul>
<li>json</li>