Merge branch 'master-to-stable' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 16:08:53 +0000 (16:08 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 16:08:53 +0000 (16:08 +0000)
Preparations for renaming `master` to `stable`

See merge request pleroma/pleroma!1840


Trivial merge