chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Wed, 31 Jan 2018 10:01:18 +0000 (10:01 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Wed, 31 Jan 2018 10:01:18 +0000 (10:01 +0000)
commit4b0f9d6653d09c1acbccd84db449f6ccefc76bc7
tree792a0ba00e500f1121fd368d0d31e2c3ef59981b
parentadaf97a3cbfeb76dc4a71add5ca2c5d2e9ebf387
parent427427481e04c5388d91f70ea1ff7869d8a95e79
Merge branch 'master' into 'master'

Option --resetserver does nothing; have it used instead

See merge request fdroid/fdroidserver!449