Merge branch 'develop' into develop-2.5

This commit is contained in:
Jeremy Stretch
2018-10-19 13:34:03 -04:00
9 changed files with 114 additions and 58 deletions

View File

@@ -17,6 +17,15 @@ v2.5.0 (FUTURE)
---
v2.4.7 (FUTURE)
## Bug Fixes
* [#2514](https://github.com/digitalocean/netbox/issues/2514) - Prevent new connections to already connected interfaces
* [#2515](https://github.com/digitalocean/netbox/issues/2515) - Only use django-rq admin tmeplate if webhooks are enabled
---
v2.4.6 (2018-10-05)
## Enhancements