Merge branch 'changelog' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)
changelog

See merge request pleroma/pleroma!1469


Trivial merge