chiark / gitweb /
Merge branch 'mr/update_docker-py' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Thu, 31 Aug 2017 12:48:18 +0000 (12:48 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Thu, 31 Aug 2017 12:48:18 +0000 (12:48 +0000)
commit781f00f211ad160aa7ba5f354599e7c670ed2ffb
treeff4fc2ab6a63072b04ac87abd5121e12892ed132
parent36ef93520c4ff5d1f44eb956bbeac3c72467b492
parentfb87751ef21d499e9215034915e673919a4e58c0
Merge branch 'mr/update_docker-py' into 'master'

setup.py: unstick docker-py and requests dependencies

See merge request !318