From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Wed, 31 Jan 2018 10:01:18 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 1.0.1~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4b0f9d6653d09c1acbccd84db449f6ccefc76bc7;p=fdroidserver.git

Merge branch 'master' into 'master'

Option --resetserver does nothing; have it used instead

See merge request fdroid/fdroidserver!449
---

4b0f9d6653d09c1acbccd84db449f6ccefc76bc7