From: rinpatch <rinpatch@sdf.org>
Date: Fri, 18 Oct 2019 12:47:45 +0000 (+0000)
Subject: Merge branch 'chore/develop-changelog-sync' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=153f652d41c311284cb1d3e0352fae7ca31c142e;p=akkoma

Merge branch 'chore/develop-changelog-sync' into 'develop'

Sync the changelog from stable and collapse the API sections

See merge request pleroma/pleroma!1859
---

153f652d41c311284cb1d3e0352fae7ca31c142e