aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/README.html
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2013-10-29 19:12:32 -0700
committerMatt Friedman <maf675@gmail.com>2013-10-29 19:12:32 -0700
commit16213c92fe71cb1029bdac3b797529c6c74f6e96 (patch)
tree2256b3b880d113b814cd8c8b42b415dd407f0ef1 /phpBB/docs/README.html
parent67beb97efec06c4a663c7eec8d54ab3194744f83 (diff)
parent2f1cf0d287f416f1c3b388d5d3e68d897f226aaf (diff)
downloadforums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar
forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.gz
forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.bz2
forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.xz
forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.zip
[ticket/11935] Merge remote-tracking branch 'upstream/develop'
PHPBB3-11935
Diffstat (limited to 'phpBB/docs/README.html')
-rw-r--r--phpBB/docs/README.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 899ca64fb5..27ace05169 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -323,7 +323,7 @@
<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
- <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.</p>
+ <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.</p>
<a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>