Merge branch 'changelog' into 'develop'
authorAlex Gleason <alex@alexgleason.me>
Tue, 28 Dec 2021 21:42:39 +0000 (21:42 +0000)
committerAlex Gleason <alex@alexgleason.me>
Tue, 28 Dec 2021 21:42:39 +0000 (21:42 +0000)
commita61ed5c488a0947d2f8cb222e0cacbac43421bc1
tree00b7721f999d54c45ccb5b45ed910018a3ecb800
parentb5b98f9e10ebe9742aa5b00b93b6491dc1dddee3
parent5f87472cdf60b987376d8fa6d2123f8acbed0bd9
Merge branch 'changelog' into 'develop'

Update CHANGELOG.md

See merge request pleroma/pleroma!3586