Merge branch 'markhoney-patch-1'

This commit is contained in:
Christian Mäder 2019-11-25 17:09:49 +01:00
commit ca2b875ab9
2 changed files with 5 additions and 2 deletions

View File

@ -1,5 +1,7 @@
.git
.github .github
.travis.yml .travis.yml
*.md
env
build* build*
*.env docker-compose.override.yml
.git

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
*.sql.gz *.sql.gz
.netbox .netbox
docker-compose.override.yml