Merge branch '2260-wrong-report-link' into 'develop'

Resolve "Wrong user link in Report email"

Closes #2260

See merge request pleroma/pleroma!3121
This commit is contained in:
lain 2020-11-10 11:04:19 +00:00
commit 88f6b61a5e
3 changed files with 7 additions and 10 deletions

View file

@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
- Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/media_graphics_packages.md`.
- Polls now always return a `voters_count`, even if they are single-choice
- Admin Emails: The ap id is used as the user link in emails now.
<details>
<summary>API Changes</summary>