aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-09 05:11:10 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-09 05:11:10 +0000
commitde592a6d33ad5c6703dc2a85fcabf6f639fdcf01 (patch)
tree92c95fb027f9f1f80dbbe494eeecfcd8588ded18
parent4cedecac45a55343aadd9b1d1381fcca906f3192 (diff)
parent73134e248a031613151df87fdd406580d16dc6b9 (diff)
downloadpleroma-de592a6d33ad5c6703dc2a85fcabf6f639fdcf01.tar.gz
Merge branch 'changelog-update' into 'develop'
No changelog entry - bug fixed only in develop See merge request pleroma/pleroma!2359
-rw-r--r--CHANGELOG.md3
1 files changed, 0 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92d1abc4e..b6e5d807c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,9 +20,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mastodon API: Support for `include_types` in `/api/v1/notifications`.
</details>
-### Fixed
-- Gun connections pool `max_connections` option.
-
## [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.