diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-15 13:36:42 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-15 13:36:42 -0700 |
| commit | 437d38bc05390c2eb1323aa2e43f3f1c8df81391 (patch) | |
| tree | 5ae17073d60475143e4e500ea17861a553cd51c4 /phpunit.xml.functional | |
| parent | 3521dfc2787a532365dba12eec669579d15d79f2 (diff) | |
| parent | 813170033006d6615071700d36ce3ba454e87753 (diff) | |
| download | forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar.gz forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar.bz2 forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar.xz forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.zip | |
Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
[ticket/11920] Have to use empty root password otherwise db creation fails.
[ticket/11920] Add MariaDB environment to Travis-CI.
Conflicts:
.travis.yml
Diffstat (limited to 'phpunit.xml.functional')
0 files changed, 0 insertions, 0 deletions