Merge branch 'update-changelog' into 'develop'

Update changelog See merge request pleroma/pleroma!1141
2019-05-12 13:22:13 +00:00 · 2019-05-12 13:22:13 +00:00 · 3ded995253
commit 3ded995253
parent 131f883207 2a4e41acb4
1 changed files with 1 additions and 0 deletions
--- 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.