Jeremy Stretch 9b39ba169c Merge branch 'develop' into api2 ...

Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
	netbox/dcim/tables.py
	requirements.txt

2017-03-02 16:01:25 -05:00

..

circuits

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

dcim

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

extras

Re-implemented CustomFieldSerializer (read-only for now)

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

ipam

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

netbox

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

project-static

Merge branch 'develop' into api2

2017-02-17 15:12:53 -05:00

secrets

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

templates

Merged develop

2017-02-28 16:10:53 -05:00

tenancy

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

users

Standardized inheritance order of BootstrapMixin

2016-12-21 14:15:18 -05:00

utilities

Merged develop

2017-02-28 16:10:53 -05:00

generate_secret_key.py

Basic Support for Python 3 (#827)

2017-01-23 16:44:29 -05:00

manage.py

…