makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source
This commit is contained in:
Marc Alexander 2014-11-26 13:37:21 +01:00
commit 36a337ffab
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

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