chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36ef935 fb87751)
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)
setup.py: unstick docker-py and requests dependencies

See merge request !318


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.