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/includes/acp/acp_users.php | |
| 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/includes/acp/acp_users.php')
0 files changed, 0 insertions, 0 deletions