summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAntoni Boucher <bouanto@zoho.com>2015-06-07 14:38:17 -0400
committerAntoni Boucher <bouanto@zoho.com>2015-06-07 14:38:17 -0400
commitcf4b89efe3f07a14fd96c29dcb302d82d5c09af7 (patch)
tree7e235b98ac0a6060ccd64a56c3582661fb6be1a5 /.gitignore
parent8b14145a4d63699ce10a80154642102d6d531d6a (diff)
parent525d3ee4c99fd72b42af876828d7f392eeb0683f (diff)
downloadqutebrowser-cf4b89efe3f07a14fd96c29dcb302d82d5c09af7.tar.gz
qutebrowser-cf4b89efe3f07a14fd96c29dcb302d82d5c09af7.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ee9b26169..696cdc775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ __pycache__
/htmlcov
/.tox
/testresults.html
+/.cache