NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-09 21:32:17 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge upstream v2.7.10 into develop

Browse Source 
# Conflicts:
#	.gitignore
#	netbox/dcim/filters.py
This commit is contained in:
Marco Ceppi
2020-03-10 14:21:33 -04:00
parent 75808d1e30 e66d065b6d
commit 2f4b566b9a
198 changed files with 3608 additions and 3231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@@ -14,12 +14,12 @@ django-taggit-serializer==0.1.7
django-timezone-field==4.0
djangorestframework==3.10.3
drf-yasg[validation]==1.17.0
gunicorn==20.0.4
Jinja2==2.10.3
Markdown==2.6.11
Markdown==3.2.1
netaddr==0.7.19
Pillow==7.0.0
psycopg2-binary==2.8.4
py-gfm==0.1.4
pycryptodome==3.9.4
PyYAML==5.3
redis==3.3.11