From: Marcus <bubu@bubu1.eu>
Date: Wed, 14 Feb 2018 21:51:11 +0000 (+0000)
Subject: Merge branch 'fdroid-deploy' into 'master'
X-Git-Tag: 1.0.1~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=997289d9cabd3e1ec2d3862c3649250362d748c6;p=fdroidserver.git

Merge branch 'fdroid-deploy' into 'master'

rename `fdroid server` to `fdroid deploy` and deprecate 'init'

Closes #264

See merge request fdroid/fdroidserver!462
---

997289d9cabd3e1ec2d3862c3649250362d748c6