Merge branch 'unknownbliss/ticket/10697' into develop-olympus

This commit is contained in:
David King 2012-03-11 12:58:55 -04:00
commit b652e1a1bb

2
.gitignore vendored
View file

@ -1,8 +1,10 @@
*~ *~
/phpunit.xml /phpunit.xml
/phpBB/cache/*.html
/phpBB/cache/*.php /phpBB/cache/*.php
/phpBB/cache/queue.php.lock /phpBB/cache/queue.php.lock
/phpBB/config.php /phpBB/config.php
/phpBB/ext/*
/phpBB/files/* /phpBB/files/*
/phpBB/images/avatars/gallery/* /phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/* /phpBB/images/avatars/upload/*