NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-07 04:27:27 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' into v2-develop

Browse Source 
Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py
This commit is contained in:
Jeremy Stretch
2017-04-13 15:42:50 -04:00
parent 50b4b5f2dc 42868b7906
commit dfa0275908
26 changed files with 290 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -11,7 +11,7 @@ djangorestframework>=3.6.2
graphviz>=0.6
Markdown>=2.6.7
natsort>=5.0.0
ncclient==0.5.2
ncclient==0.5.3
netaddr==0.7.18
paramiko>=2.0.0
Pillow>=4.0.0