From: rinpatch <rinpatch@sdf.org>
Date: Sun, 12 May 2019 13:22:13 +0000 (+0000)
Subject: Merge branch 'update-changelog' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=3ded995253c9a430fcef1b210eb20fd33a409598;hp=131f88320740bec9c74e4280a6b1a7d8641ee367;p=akkoma

Merge branch 'update-changelog' into 'develop'

Update changelog

See merge request pleroma/pleroma!1141
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a761c4a..b9c9538b0 100644
--- 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.