diff options
| author | feld <feld@feld.me> | 2020-10-17 17:45:51 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-17 17:45:51 +0000 |
| commit | be611b143bf2840c039aaf63dbf1a73d9f9daf7b (patch) | |
| tree | b733a9aec007016c2cd64ddbaf0feb7d8543f4ef | |
| parent | 023f726d7f497705d766adee8874b94efb08a0aa (diff) | |
| parent | cb3ee4d543861e65a1de974c3920fdecdcf6a6a7 (diff) | |
| download | pleroma-be611b143bf2840c039aaf63dbf1a73d9f9daf7b.tar.gz | |
Merge branch 'chore/changelogfix' into 'develop'
Fix duplicate Added sections in the changelog
See merge request pleroma/pleroma!3091
| -rw-r--r-- | CHANGELOG.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 36a84b1a8..05e94581a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`) - Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`) - Mix task option for force-unfollowing relays +- Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details). +- Pleroma API: Importing the mutes users from CSV files. +- Experimental websocket-based federation between Pleroma instances. ### Changed @@ -23,11 +26,6 @@ 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`. -### Added -- Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details). -- Pleroma API: Importing the mutes users from CSV files. -- Experimental websocket-based federation between Pleroma instances. - <details> <summary>API Changes</summary> |