diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-13 23:27:09 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-13 23:27:09 +0100 |
| commit | 196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8 (patch) | |
| tree | 6b64a33c422e0394f6c8bae15f5fcc47190083be | |
| parent | 28fb9ed080de5f6d08e76225e0baf3551fa6da58 (diff) | |
| parent | 7611e1160832dd8338225d36093026198a1ba0d8 (diff) | |
| download | forums-196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8.tar forums-196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8.tar.gz forums-196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8.tar.bz2 forums-196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8.tar.xz forums-196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 |