Merge branch 'feld-develop-patch-26755' into 'develop'
authorfeld <feld@feld.me>
Sun, 28 Feb 2021 19:01:01 +0000 (19:01 +0000)
committerfeld <feld@feld.me>
Sun, 28 Feb 2021 19:01:01 +0000 (19:01 +0000)
commit9fb8da429360ddb9433f4c740126e2d858b1f141
treedf1e36475b3cb046741083d18c1aec5ba98734bc
parente8d88a72cf6633444f9056807f6e048c66cf952d
parent8a563efdd8975d37143953d173c40f9e2d1aab99
Merge branch 'feld-develop-patch-26755' into 'develop'

Update CHANGELOG.md

See merge request pleroma/pleroma!3351