aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-03-11 19:44:39 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-03-11 19:44:39 -0500
commit81d281f9e51d90742ef3a27d7ad831f0980c4e54 (patch)
treea4dc407b0a8300b8bf996403073c9f082707c68f
parent33c38b37d886e56a60b5b144a1ab8eb8f42a8430 (diff)
parent2fb9bfe3b3803feffdaa293fdd9ad23a0d428a1d (diff)
downloadforums-81d281f9e51d90742ef3a27d7ad831f0980c4e54.tar
forums-81d281f9e51d90742ef3a27d7ad831f0980c4e54.tar.gz
forums-81d281f9e51d90742ef3a27d7ad831f0980c4e54.tar.bz2
forums-81d281f9e51d90742ef3a27d7ad831f0980c4e54.tar.xz
forums-81d281f9e51d90742ef3a27d7ad831f0980c4e54.zip
Merge branch 'ticket/erikfrerejean/10090' into develop-olympus
* ticket/erikfrerejean/10090: [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 22a3124b69..8298f5a894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*~
phpunit.xml
phpBB/cache/*.php
+phpBB/cache/queue.php.lock
phpBB/config.php
phpBB/files/*
phpBB/images/avatars/gallery/*