1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00

Merge branch '3.1.x' into 3.2.x

Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
This commit is contained in:
Marc Alexander
2016-07-07 19:19:40 +02:00
4 changed files with 5 additions and 5 deletions

View File

@@ -160,7 +160,7 @@
<li>zlib Compression support</li>
<li>Remote FTP support</li>
<li>XML support</li>
<li>Imagemagick support</li>
<li>ImageMagick support</li>
<li>GD Support</li>
</ul>
</li>