From: rinpatch <rinpatch@sdf.org>
Date: Mon, 14 Oct 2019 16:47:27 +0000 (+0000)
Subject: Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7;p=akkoma

Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'

Backport/1.1 branch name change

See merge request pleroma/pleroma!1841
---

13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7