diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-05 10:00:05 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-05 10:00:05 +0000 |
| commit | e07e9cb75e6605218acea1ef41772ca29124bd0d (patch) | |
| tree | 2a79aae59c6ce7500d360ba35a5b0aafe2146072 /CHANGELOG.md | |
| parent | 9c47d8571c6c46503d9bb836aea933eda6e9e0a5 (diff) | |
| download | pleroma-e07e9cb75e6605218acea1ef41772ca29124bd0d.tar.gz pleroma-e07e9cb75e6605218acea1ef41772ca29124bd0d.zip | |
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index db505591b..b42b13018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Pleroma API: `GET /api/v1/pleroma/accounts/:id/scrobbles` to get a list of recently scrobbled items - Pleroma API: `POST /api/v1/pleroma/scrobble` to scrobble a media item - Mastodon API: Add `upload_limit`, `avatar_upload_limit`, `background_upload_limit`, and `banner_upload_limit` to `/api/v1/instance` -- Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity ### Changed - **Breaking:** Elixir >=1.8 is now required (was >= 1.7) |