Merge branch 'update-changelog' into 'develop'

Update changelog

See merge request pleroma/pleroma!1141

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a761c4adcb223b7fc2027b89d9926933c3de5d..b9c9538b070e4601f416f656c853f35509c460c5 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Deps: Updated Ecto to 3.0.7
 - Don't ship finmoji by default, they can be installed as an emoji pack
 - Mastodon API: Added support max_id & since_id for bookmark timeline endpoints.
+- Admin API: Move the user related API to `api/pleroma/admin/users`
 
 ### Fixed
 - Added an FTS index on objects. Running `vacuum analyze` and setting a larger `work_mem` is recommended.