Jeremy Stretch 57fc6a3f50 Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/netbox/settings.py
	netbox/netbox/urls.py
	requirements.txt

2017-04-06 17:01:13 -04:00

..

circuits

Resolved RemovedInDjango20Warning deprecation warnings

2017-04-05 14:40:25 -04:00

dcim

Merge branch 'develop' into v2-develop

2017-04-06 17:01:13 -04:00

extras

Colored nodes in topology maps

2017-04-06 14:12:30 -04:00

ipam

Merge branch 'develop' into v2-develop

2017-04-06 17:01:13 -04:00

media/image-attachments

Initial work on #152: Image attachments

2017-03-30 21:55:57 -04:00

netbox

Post-release version bump

2017-04-06 16:36:42 -04:00

project-static

Fixes #1049: Prompt user if missing session key when adding/editing a secret

2017-04-06 13:55:40 -04:00

secrets

Fixes #1049: Prompt user if missing session key when adding/editing a secret

2017-04-06 13:55:40 -04:00

templates

Merge branch 'develop' into v2-develop

2017-04-06 17:01:13 -04:00

tenancy

Resolved RemovedInDjango20Warning deprecation warnings

2017-04-05 14:40:25 -04:00

users

Resolved RemovedInDjango20Warning deprecation warnings

2017-04-05 14:40:25 -04:00

utilities

Resolved RemovedInDjango20Warning deprecation warnings

2017-04-05 14:40:25 -04:00

generate_secret_key.py

…

manage.py

…