Jeremy Stretch 02e89d77bb Merge branch 'develop' into api2 ...

Conflicts:
	netbox/dcim/api/views.py

2017-03-07 14:08:06 -05:00

..

api

Re-implemented CustomFieldSerializer (read-only for now)

2017-02-09 16:55:54 -05:00

fixtures

…

management

Fixes #941: Corrected old references to rack.site on Device

2017-03-06 10:23:24 -05:00

migrations

…

tests

…

__init__.py

…

admin.py

…

filters.py

…

forms.py

…

models.py

…

rpc.py

…