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

Initial push to public repo

2016-03-01 11:23:03 -05:00

exceptions.py

Initial push to public repo

2016-03-01 11:23:03 -05:00

serializers.py

Merge branch 'develop' into api2

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

urls.py

Merge branch 'develop' into api2

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

views.py

Closes #105: Interface groups (#919)

2017-02-27 16:52:13 -05:00