[stable/2.0,1/2] gitignore: Synchronize with master

Message ID 20180516141359.14873-1-stephen@that.guru
State Accepted
Headers show
Series
  • [stable/2.0,1/2] gitignore: Synchronize with master
Related show

Commit Message

Stephen Finucane May 16, 2018, 2:13 p.m.
These files are still present on the older branch.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Stephen Finucane May 17, 2018, 9:16 a.m. | #1
On Wed, 2018-05-16 at 15:13 +0100, Stephen Finucane wrote:
> These files are still present on the older branch.
> 
> Signed-off-by: Stephen Finucane <stephen@that.guru>

Trivial change. Applied.

Patch

diff --git a/.gitignore b/.gitignore
index 31fea23c..aa7336db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,14 +31,18 @@  cscope.*
 *~
 \#*\#
 
+*.sql
+
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.venv/
 .coverage
 .coverage.*
 
 # Django stuff
 *.log
+/*.json
 
 # Sphinx stuff
 /docs/_build
@@ -52,3 +56,6 @@  htmlcov/
 
 # Patchwork configuration files
 patchwork/settings/production.py
+
+# docker-compose configuration files
+/.env