Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
This commit is contained in:
Oleg Pudeyev 2011-03-11 19:44:54 -05:00
commit db70d613bc

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
*~ *~
phpunit.xml phpunit.xml
phpBB/cache/*.php phpBB/cache/*.php
phpBB/cache/queue.php.lock
phpBB/config.php phpBB/config.php
phpBB/files/* phpBB/files/*
phpBB/images/avatars/gallery/* phpBB/images/avatars/gallery/*