diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-13 23:26:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-13 23:26:58 +0100 |
| commit | 7611e1160832dd8338225d36093026198a1ba0d8 (patch) | |
| tree | 64b6f7151abe44aaa80b8e25a63250db4631c0e2 | |
| parent | a4e48410821e2569a4561e06f1627cb9dbce76ca (diff) | |
| parent | 845bf6a6384b758c78229738db69845604f02437 (diff) | |
| download | forums-7611e1160832dd8338225d36093026198a1ba0d8.tar forums-7611e1160832dd8338225d36093026198a1ba0d8.tar.gz forums-7611e1160832dd8338225d36093026198a1ba0d8.tar.bz2 forums-7611e1160832dd8338225d36093026198a1ba0d8.tar.xz forums-7611e1160832dd8338225d36093026198a1ba0d8.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11262' into develop-olympus
* EXreaction/ticket/11262:
[ticket/11262] Add .lock in cache directory to .gitignore
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 4093aeb56d..c757210654 100644 --- a/.gitignore +++ b/.gitignore @@ -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 |