Nils Adermann 4649155f41
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
2013-10-20 16:05:46 -07:00
2013-10-20 14:53:44 -07:00
2013-10-20 11:12:55 -07:00
2013-09-17 16:18:04 +02:00
2013-10-13 16:01:00 -07:00
2013-10-10 18:19:20 -05:00
2013-10-20 16:05:46 -07:00
2013-09-17 16:15:44 +02:00
2013-10-17 21:29:02 -07:00
2013-10-15 22:46:02 +02:00
2013-10-16 10:07:54 -07:00
2013-10-16 00:02:51 +02:00
2013-10-20 14:53:44 -07:00
2013-09-26 15:34:44 +02:00
2013-09-30 18:44:02 -05:00
2013-09-13 15:56:28 -05:00
2013-09-13 15:56:28 -05:00
2013-09-16 00:25:27 +02:00
2013-10-03 20:22:41 -07:00
2013-10-11 17:40:16 +02:00
2013-09-16 01:24:05 +02:00
2013-09-16 01:24:05 +02:00
2013-09-16 01:24:05 +02:00
2013-10-07 17:55:04 -07:00
4649155f41