Merge branch 'markhoney-patch-1'

cimnine · cimnine · commit ca2b875ab9f1 · 2019-11-25T17:09:49.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,7 @@
+.git
 .github
 .travis.yml
+*.md
+env
 build*
-*.env
-.git
+docker-compose.override.yml
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.sql.gz
 .netbox
+docker-compose.override.yml

-Original file line number
+Diff line change
@@ @@ -1,5 +1,7 @@ @@
 +.git
 .github
 .travis.yml
 +*.md
 +env
 build*
 -*.env
 -.git
 +docker-compose.override.yml