diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-11 19:44:54 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-11 19:44:54 -0500 |
| commit | db70d613bcdca69be7b634d742ec79dc3f9725de (patch) | |
| tree | dff07abb97da6d9d1083405bc2aaec570b6d7434 | |
| parent | f0a000b17666c5eb49a66c3daf93e53a0cf1133c (diff) | |
| parent | 81d281f9e51d90742ef3a27d7ad831f0980c4e54 (diff) | |
| download | forums-db70d613bcdca69be7b634d742ec79dc3f9725de.tar forums-db70d613bcdca69be7b634d742ec79dc3f9725de.tar.gz forums-db70d613bcdca69be7b634d742ec79dc3f9725de.tar.bz2 forums-db70d613bcdca69be7b634d742ec79dc3f9725de.tar.xz forums-db70d613bcdca69be7b634d742ec79dc3f9725de.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 537b41b523..16dba4ad47 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/* |