Merge branch 'develop' into develop-2.7

This commit is contained in:
Jeremy Stretch
2019-10-10 13:41:10 -04:00
86 changed files with 3001 additions and 2603 deletions

View File

@@ -1,4 +1,3 @@
# Models which support custom fields
CUSTOMFIELD_MODELS = [
'circuits.circuit',