Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Joas Schilling 2014-11-17 22:47:58 +01:00
commit c09c95599b

View file

@ -37,15 +37,9 @@
</groups> </groups>
<filter> <filter>
<blacklist>
<directory>./tests</directory>
</blacklist>
<whitelist> <whitelist>
<directory suffix=".php">./phpBB/includes/</directory> <directory suffix=".php">./phpBB/includes/</directory>
<directory suffix=".php">./phpBB/phpbb/</directory> <directory suffix=".php">./phpBB/phpbb/</directory>
<exclude>
<directory suffix=".php">./phpBB/includes/captcha/</directory>
</exclude>
</whitelist> </whitelist>
</filter> </filter>
</phpunit> </phpunit>