Merge branch 'user-timelines-changelog' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 9 Dec 2019 17:50:00 +0000 (17:50 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 9 Dec 2019 17:50:00 +0000 (17:50 +0000)
Changelog: Update with user timeline change info.

See merge request pleroma/pleroma!2049

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge