Merge branch 'develop' into feature

2024-10-11 11:29:36 -04:00
parent 65687851fe 7ac6dff96d
commit 256b5dc676
232 changed files with 3956 additions and 3334 deletions
--- a/netbox/circuits/forms/bulk_import.py
+++ b/netbox/circuits/forms/bulk_import.py
@@ -1,5 +1,4 @@
 from django import forms
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _

 from circuits.choices import *