Merge branch 'develop' into feature

2026-03-21 08:59:44 +01:00 · 2024-07-09 15:16:05 -04:00
parent 12cd2a7d6f dd413b248a
commit 02ae91589d
61 changed files with 12100 additions and 11072 deletions
--- a/netbox/extras/forms/bulk_import.py
+++ b/netbox/extras/forms/bulk_import.py
@@ -229,9 +229,6 @@ class TagImportForm(CSVModelForm):
    class Meta:
        model = Tag
        fields = ('name', 'slug', 'color', 'description')
-        help_texts = {
-            'color': mark_safe(_('RGB color in hexadecimal. Example:') + ' <code>00ff00</code>'),
-        }


 class JournalEntryImportForm(NetBoxModelImportForm):