1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

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
This commit is contained in:
Nils Adermann
2013-10-20 16:05:46 -07:00
2 changed files with 2 additions and 1 deletions

View File

@@ -132,6 +132,7 @@
<li>A SQL database system, <strong>one of</strong>:
<ul>
<li>MySQL 3.23 or above (MySQLi supported)</li>
<li>MariaDB 5.1 or above</li>
<li>PostgreSQL 8.3+</li>
<li>SQLite 2.8.2+ (SQLite 3 is not supported)</li>
<li>Firebird 2.1+</li>