Jeremy Stretch 3466da4338 Merge branch 'develop' into develop-2.2 ...

Conflicts:
	netbox/dcim/forms.py

2017-09-14 14:58:45 -04:00

..

forms.js

Don't add a placeholder option to multiselect widgets

2017-09-12 14:14:08 -04:00

graphs.js

…

jquery-3.2.1.min.js

…

livesearch.js

…

secrets.js

Fixes #1472: Secret truncated when using '<' character (#1477)

2017-09-11 10:55:04 -04:00