diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-13 13:05:40 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-13 13:05:40 +0000 |
| commit | ef37774403ff5af69a637875240eec205b6f55a5 (patch) | |
| tree | 22239f2cc64f27e5db487e0fea919e13137b3e57 /CHANGELOG.md | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| parent | 5c76afb06c731557b537f928296e0b5c259f8d5e (diff) | |
| download | pleroma-ef37774403ff5af69a637875240eec205b6f55a5.tar.gz pleroma-ef37774403ff5af69a637875240eec205b6f55a5.zip | |
Merge branch 'output-of-relationships-in-statuses' into 'develop'
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 36897503a..8de65d752 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,7 +67,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [2.0.0] - 2019-03-08 ### Security -- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request. +- Mastodon API: Fix being able to request enormous amount of statuses in timelines leading to DoS. Now limited to 40 per request. ### Removed - **Breaking**: Removed 1.0+ deprecated configurations `Pleroma.Upload, :strip_exif` and `:instance, :dedupe_media` |