1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00

Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Marc Alexander 2014-11-26 13:37:21 +01:00
commit 36a337ffab

4
.gitignore vendored
View File

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