diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-14 12:07:31 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-14 12:07:31 -0500 |
| commit | 25d1caf1ddae3730f2554d35d89a0c2692927d99 (patch) | |
| tree | c58ecf32269f7224e899ced85e6d346566c49112 | |
| parent | d31f0393bfaa733cf68058c21294874daa286e0a (diff) | |
| download | pleroma-25d1caf1ddae3730f2554d35d89a0c2692927d99.tar.gz | |
Merge duplicate Changed sections
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 75357f05e..e94f2eda2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated. - Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated. +- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). ### Removed @@ -16,9 +17,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **Breaking:** `Pleroma.Workers.Cron.ClearOauthTokenWorker` setting from Oban `:crontab` (moved to scheduled jobs). - **Breaking:** `Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker` setting from Oban `:crontab` (moved to scheduled jobs). -### Changed -- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). - ## [2.1.1] - 2020-09-08 ### Security |