Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information

2020-07-06 11:27:06 +02:00 · 2020-07-06 11:27:06 +02:00 · 74b88c0a8b
commit 74b88c0a8b
parent ef4c16f6f1 69f0b286f7
20 changed files with 107 additions and 23 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **Breaking:** Emoji API: changed methods and renamed routes.
 - Streaming: Repeats of a user's posts will no longer be pushed to the user's stream.
 - Mastodon API: Added `pleroma.metadata.fields_limits` to /api/v1/instance
+- Mastodon API: On deletion, returns the original post text.
 </details>

 <details>