Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11262] Add .lock in cache directory to .gitignore
This commit is contained in:
Andreas Fischer 2012-12-13 23:27:09 +01:00
commit 196bde21c4

2
.gitignore vendored
View file

@ -2,7 +2,7 @@
/phpunit.xml
/phpBB/cache/*.html
/phpBB/cache/*.php
/phpBB/cache/queue.php.lock
/phpBB/cache/*.lock
/phpBB/composer.phar
/phpBB/config.php
/phpBB/config_dev.php