Merge branch 'develop' into pr/1

This commit is contained in:
acronpl 2019-07-25 00:11:39 +02:00
commit d7ede5fc57

6
.gitignore vendored
View File

@ -1,4 +1,3 @@
*.pyc
/netbox/netbox/configuration.py
/netbox/netbox/ldap_config.py
/netbox/reports/*
@ -12,3 +11,8 @@ fabfile.py
gunicorn_config.py
.DS_Store
.vscode
netbox.iml
Pipfile
__pycache__/
/venv/
/out/