From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Tue, 24 Oct 2017 13:40:53 +0000 (+0000)
Subject: Merge branch 'patch-1' into 'master'
X-Git-Tag: 0.9~48
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=23265e3290eec309dbc3f05a7ea306ee1a3ac365

Merge branch 'patch-1' into 'master'

HTTP, HTTPS

See merge request fdroid/fdroidserver!360
---

23265e3290eec309dbc3f05a7ea306ee1a3ac365