Jeremy Stretch b71566f206 Merge branch 'develop' into api2 ...

Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py

2017-02-16 14:28:06 -05:00

..

api

Merge branch 'develop' into api2

2017-02-16 14:28:06 -05:00

fixtures

…

migrations

…

tests

Merge branch 'develop' into api2

2017-02-16 14:28:06 -05:00

__init__.py

…

admin.py

…

apps.py

…

fields.py

…

filters.py

Merge branch 'develop' into api2

2017-02-16 14:28:06 -05:00

formfields.py

…

forms.py

…

models.py

…

tables.py

…

urls.py

…

views.py

…