From: kaniini <ariadne@dereferenced.org>
Date: Sun, 4 Aug 2019 04:32:09 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b9497ead3513ba3b93e9a4549e482f4a720aa83d;p=akkoma

Merge branch 'develop' into 'develop'

Fix a stale link and a few typos

See merge request pleroma/pleroma!1529
---

b9497ead3513ba3b93e9a4549e482f4a720aa83d