Merge branch 'develop-2.9' into 554-object-permissions

This commit is contained in:
Jeremy Stretch
2020-05-26 16:42:39 -04:00
52 changed files with 830 additions and 521 deletions

View File

@@ -1,8 +1,8 @@
from django import forms
from taggit.forms import TagField
from extras.forms import (
AddRemoveTagsForm, CustomFieldModelForm, CustomFieldBulkEditForm, CustomFieldFilterForm, CustomFieldModelCSVForm,
TagField,
)
from utilities.forms import (
APISelect, APISelectMultiple, BootstrapMixin, CommentField, CSVModelChoiceField, CSVModelForm,