Merge branch 'develop' into feature

This commit is contained in:
Jeremy Stretch
2024-07-09 15:16:05 -04:00
61 changed files with 12100 additions and 11072 deletions
-3
View File
@@ -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):