Jeremy Stretch 04aedcc056 Merge branch 'develop' into api2 ...

Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py

2017-03-14 12:40:28 -04:00

..

api

Standardized API URL definitions

2017-03-09 13:24:02 -05:00

fixtures

…

migrations

…

tests

…

__init__.py

…

admin.py

…

apps.py

…

fields.py

…

filters.py

…

formfields.py

…

forms.py

Allow assigning child devices to rackless parents

2017-03-13 11:31:28 -04:00

models.py

Fixes #950: Fix site_id error on child device import

2017-03-13 11:18:33 -04:00

tables.py

…

urls.py

…

views.py

Fixes #950: Fix site_id error on child device import

2017-03-13 11:18:33 -04:00