LBP/netbox @ 43f3e682c52202713ef6e3ed851a6c2bae5df9a7

Jeremy Stretch 08c492f1f4 Merge develop into develop-2.10		5 vuotta sitten
..
api	fd139a77f5 Closes #4997: Introduce OrderedDefaultRouter; move root API views to views.py	6 vuotta sitten
migrations	e6bc55af85 #4969: Remove user and group assignment from SecretRole	6 vuotta sitten
tests	053c600b67 Closes #4943: Add a 'description' field to ObjectPermission	6 vuotta sitten
__init__.py	27b289ee3b Initial push to public repo	10 vuotta sitten
admin.py	4a516103a6 Extend ObjectPermission constraints to OR multiple JSON objects	6 vuotta sitten
filters.py	380d30e612 Add filters for ObjectPermissions	6 vuotta sitten
forms.py	7399aa0c5e Add datetime widgets	6 vuotta sitten
models.py	aca3ca9d65 Simplify the aggregation of constraint sets	6 vuotta sitten
urls.py	587339bea0 Add page for user to view/clear preferences	6 vuotta sitten
views.py	08c492f1f4 Merge develop into develop-2.10	5 vuotta sitten