Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Joas Schilling 2014-11-25 22:45:37 +01:00
commit 74dfb56459

7
.gitignore vendored
View file

@ -1,9 +1,8 @@
*~ *~
/phpunit.xml /phpunit.xml
/phpBB/cache/twig/* /phpBB/cache/*
/phpBB/cache/*.html !/phpBB/.htaccess
/phpBB/cache/*.php !/phpBB/index.html
/phpBB/cache/*.lock
/phpBB/composer.phar /phpBB/composer.phar
/phpBB/config*.php /phpBB/config*.php
/phpBB/ext/* /phpBB/ext/*