From: rinpatch <rinpatch@sdf.org>
Date: Mon, 14 Oct 2019 16:08:53 +0000 (+0000)
Subject: Merge branch 'master-to-stable' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8b39d6f93cc6f9aecc76d67a686087366c3c50fd;p=akkoma

Merge branch 'master-to-stable' into 'develop'

Preparations for renaming `master` to `stable`

See merge request pleroma/pleroma!1840
---

8b39d6f93cc6f9aecc76d67a686087366c3c50fd