Merge remote-tracking branch 'unknownbliss/ticket/10680' into develop

This commit is contained in:
David King 2012-02-29 17:00:33 -05:00
commit 331f1f9086

1
.gitignore vendored
View file

@ -4,6 +4,7 @@
/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/*