Jeremy Stretch 576e21eb65 Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/netbox/settings.py

2017-03-23 17:14:41 -04:00

..

__init__.py

Initial push to public repo

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

configuration.docker.py

Allow multiple ALLOWED_HOSTS on docker

2016-10-02 21:01:29 -06:00

configuration.example.py

Fixes #843: Implemented CORS headers for API

2017-03-21 13:53:07 -04:00

settings.py

Merge branch 'develop' into v2-develop

2017-03-23 17:14:41 -04:00

urls.py

Include the API version in responses

2017-03-21 13:23:56 -04:00

views.py

APIRootView tweaks

2017-03-09 15:18:50 -05:00

wsgi.py

Initial push to public repo

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