Jeremy Stretch 8f42f59a80 Merge branch 'develop' into api2 ...

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

2017-02-27 17:04:08 -05:00

..

__init__.py

…

test_apis.py

Merge branch 'develop' into api2

2017-02-27 17:04:08 -05:00

test_forms.py

…

test_models.py

Closes #198: Support for rackless devices (#902)

2017-02-17 14:48:00 -05:00