From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Thu, 31 Aug 2017 12:48:18 +0000 (+0000)
Subject: Merge branch 'mr/update_docker-py' into 'master'
X-Git-Tag: 0.9~97
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=781f00f211ad160aa7ba5f354599e7c670ed2ffb

Merge branch 'mr/update_docker-py' into 'master'

setup.py: unstick docker-py and requests dependencies

See merge request !318
---

781f00f211ad160aa7ba5f354599e7c670ed2ffb