diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-20 16:05:46 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-20 16:05:46 -0700 |
| commit | 4649155f415310a67be409ff15a3140accbae799 (patch) | |
| tree | 967bb24f416030eee5d81eecddeb5b209a196821 /phpBB/docs/README.html | |
| parent | 1aa80b47b164a59cdaf2be226f40a2af99a9f3f1 (diff) | |
| parent | a5eaaa10dcb84ab98312dcebf90930da581d7165 (diff) | |
| download | forums-4649155f415310a67be409ff15a3140accbae799.tar forums-4649155f415310a67be409ff15a3140accbae799.tar.gz forums-4649155f415310a67be409ff15a3140accbae799.tar.bz2 forums-4649155f415310a67be409ff15a3140accbae799.tar.xz forums-4649155f415310a67be409ff15a3140accbae799.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11951] Add MariaDB to platforms we test on.
[ticket/11951] Add MariaDB to supported DBMSes in requirement section.
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
Diffstat (limited to 'phpBB/docs/README.html')
| -rw-r--r-- | phpBB/docs/README.html | 2 |
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> |