Merge branch 'develop' into develop-2.7

2020-01-09 15:27:06 -05:00
parent 1d3651e255 6019260374
commit a2ead6af94
38 changed files with 4690 additions and 403 deletions
--- a/netbox/circuits/filters.py
+++ b/netbox/circuits/filters.py
@@ -8,6 +8,13 @@ from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilte
 from .choices import *
 from .models import Circuit, CircuitTermination, CircuitType, Provider

+__all__ = (
+    'CircuitFilter',
+    'CircuitTerminationFilter',
+    'CircuitTypeFilter',
+    'ProviderFilter',
+)
+

 class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
    id__in = NumericInFilter(