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

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
	netbox/dcim/tables.py
	requirements.txt
This commit is contained in:
Jeremy Stretch
2017-03-02 16:01:25 -05:00
parent acaf558b42 ac47fba481
commit 5a7630e560
26 changed files with 488 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@@ -2,7 +2,11 @@ cffi>=1.8
cryptography>=1.4
Django>=1.10
django-debug-toolbar>=1.6
<<<<<<< HEAD
django-filter==0.15.3
=======
django-filter>=1.0.1
>>>>>>> develop
django-mptt==0.8.7
django-rest-swagger==0.3.10
django-tables2>=1.2.5