Jeremy Stretch ba8f48af65 Merge branch 'develop' into develop-2.1 ... Conflicts: netbox/netbox/settings.py		2017-06-15 14:26:02 -04:00
..
circuits	Fixes #1266: Prevent termination a circuit to an already-connected interface	2017-06-14 10:57:43 -04:00
dcim	Merge branch 'develop' into develop-2.1	2017-06-15 14:26:02 -04:00
extras	Fixes #1274: Exclude unterminated circuits from topology maps	2017-06-15 10:05:14 -04:00
ipam	Merge branch 'develop' into develop-2.1	2017-06-15 14:26:02 -04:00
media/image-attachments	Initial work on #152: Image attachments	2017-03-30 21:55:57 -04:00
netbox	Release v2.0.7	2017-06-15 14:22:16 -04:00
project-static	#1265: Improved livesearch UI Javascript	2017-06-14 14:50:12 -04:00
secrets	Fixes #1263: Differentiate add and edit permissions for objects	2017-06-13 16:41:57 -04:00
templates	Merge branch 'develop' into develop-2.1	2017-06-15 14:26:02 -04:00
tenancy	Fixes #1263: Differentiate add and edit permissions for objects	2017-06-13 16:41:57 -04:00
users	Created migrations for transition to Unicode literals	2017-05-24 14:18:52 -04:00
utilities	Fixes #1265: Fix console/power/interface connection validation when selecting a device via live search	2017-06-14 13:00:36 -04:00
generate_secret_key.py	Fixes #1092: Increase randomness in SECRET_KEY generation tool	2017-04-21 10:32:10 -04:00
manage.py	Initial push to public repo	2016-03-01 11:23:03 -05:00