aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-22 16:37:35 +0000
committerAlex Gleason <alex@alexgleason.me>2021-12-22 16:37:35 +0000
commit05c7a141016cc7709357922842c7f9fb88c5b9aa (patch)
tree22badc197c198f7303cc58d08398924fcffde7a6 /CHANGELOG.md
parent9c1cb87eff1fdd20f47355971831545a79c7cd3a (diff)
parent3f8fc34593414f6e35925038c38775203333b3f3 (diff)
downloadpleroma-05c7a141016cc7709357922842c7f9fb88c5b9aa.tar.gz
Merge branch 'moderators' into 'develop'
AdminAPI: let moderators actually do things Closes #2490 See merge request pleroma/pleroma!3480
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecefba381..07d6d1934 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Attachment dimensions and blurhashes are federated when available.
- Mastodon API: support `poll` notification.
- Pinned posts federation
+- AdminAPI: allow moderators to manage reports, users, invites, and custom emojis
### Fixed
- Don't crash so hard when email settings are invalid.