diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2019-05-08 14:34:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-08 14:34:36 +0000 |
| commit | bfeb33e951c8997f33a0242fe69b8e669e3afe07 (patch) | |
| tree | b7bc5876873d8de83bdce72961897b5cbb852cc1 /CHANGELOG.md | |
| parent | 289b8224ac97a873569255b97f7391c2389ac3dc (diff) | |
| download | pleroma-bfeb33e951c8997f33a0242fe69b8e669e3afe07.tar.gz pleroma-bfeb33e951c8997f33a0242fe69b8e669e3afe07.zip | |
Merge develop
Merge conflict in lib/pleroma/activity.ex
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 210aae2e4..b0a761c4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Pleroma API: Healthcheck endpoint - Admin API: Endpoints for listing/revoking invite tokens - Admin API: Endpoints for making users follow/unfollow each other +- Admin API: added filters (role, tags, email, name) for users endpoint - Mastodon API: [Scheduled statuses](https://docs.joinmastodon.org/api/rest/scheduled-statuses/) - Mastodon API: `/api/v1/notifications/destroy_multiple` (glitch-soc extension) - Mastodon API: `/api/v1/pleroma/accounts/:id/favourites` (API extension) |