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	Standardized graph display; added templatization for graph links	2016-06-24 11:16:49 -04:00
jquery-3.2.1.min.js	Upgraded jQuery to v3.2.1	2017-07-14 10:17:09 -04:00
livesearch.js	#1265: Improved livesearch UI Javascript	2017-06-14 14:50:12 -04:00
secrets.js	Fixes #1472: Secret truncated when using '<' character (#1477)	2017-09-11 10:55:04 -04:00