From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Wed, 29 Nov 2017 19:34:11 +0000 (+0000)
Subject: Merge branch 's3cfg' into 'master'
X-Git-Tag: 1.0.0~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1219f07d3b8ba195a8153e52cedfa9db138c0b5f;p=fdroidserver.git

Merge branch 's3cfg' into 'master'

server: allow user to specify custom s3cfg file

Closes #413

See merge request fdroid/fdroidserver!385
---

1219f07d3b8ba195a8153e52cedfa9db138c0b5f