From: kaniini <ariadne@dereferenced.org>
Date: Mon, 22 Jul 2019 19:53:53 +0000 (+0000)
Subject: Merge branch 'changelog' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=2951714429f3ea2d6aef81cbe8edc3dcd6dff6e6;p=akkoma

Merge branch 'changelog' into 'develop'

changelog

See merge request pleroma/pleroma!1469
---

2951714429f3ea2d6aef81cbe8edc3dcd6dff6e6