aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-20 16:28:59 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-20 16:28:59 +0200
commitac29211f91d88f18cf80a72171ff88e45a4b000b (patch)
treee1f612c38f724819f78644f1f8c99c3edd99d873 /phpBB/docs
parent9c6b3d3931850e31336f38624e4118d288391231 (diff)
parent57a575b5f0e3ddd6f42ed7ee225da407044e19bc (diff)
downloadforums-ac29211f91d88f18cf80a72171ff88e45a4b000b.tar
forums-ac29211f91d88f18cf80a72171ff88e45a4b000b.tar.gz
forums-ac29211f91d88f18cf80a72171ff88e45a4b000b.tar.bz2
forums-ac29211f91d88f18cf80a72171ff88e45a4b000b.tar.xz
forums-ac29211f91d88f18cf80a72171ff88e45a4b000b.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/INSTALL.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 97992b2a7a..c6e8921de4 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -142,10 +142,11 @@
</ul>
</li>
<li><strong>PHP 5.3.3+</strong> with support for the database you intend to use.</li>
- <li>The following PHP modules are required:</li>
+ <li>The following PHP modules are required:
<ul>
<li>json</li>
</ul>
+ </li>
<li>getimagesize() function must be enabled.</li>
<li>Presence of the following modules within PHP will provide access to additional features, but they are not required:
<ul>