Merge v2.5 work

2018-12-07 10:51:28 -05:00
parent 869194354c 9689ba2c4f
commit 65edffea63
396 changed files with 8663 additions and 6511 deletions
--- a/netbox/extras/webhooks_worker.py
+++ b/netbox/extras/webhooks_worker.py
@@ -1,8 +1,8 @@
 import hashlib
 import hmac
-import requests
 import json

+import requests
 from django_rq import job
 from rest_framework.utils.encoders import JSONEncoder