mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into develop-2.2

Browse Source 
Conflicts:
	netbox/utilities/api.py
This commit is contained in:
Jeremy Stretch
2017-10-11 10:47:21 -04:00
parent f253f164a3 b69bf58c63
commit 007f930fed
6 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/netbox/settings.py
View File

@ -214,7 +214,7 @@ REST_FRAMEWORK = {
'netbox.api.TokenAuthentication',
),
'DEFAULT_FILTER_BACKENDS': (
'rest_framework.filters.DjangoFilterBackend',
'django_filters.rest_framework.DjangoFilterBackend',
),
'DEFAULT_PAGINATION_CLASS': 'netbox.api.OptionalLimitOffsetPagination',
'DEFAULT_PERMISSION_CLASSES': (