summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-10-21 21:13:49 +0300
committerrinpatch <rinpatch@sdf.org>2020-10-21 21:14:58 +0300
commitfb0e3403632ed10ba7d226d998618e0a894d2538 (patch)
tree0e818541570d71bc63676b7b7f7d2454af48ed8a /CHANGELOG.md
parent274c8e6fabeb65813f76766ccaa22227168c726e (diff)
Rip out fedsockets from the release branch
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 649d8c902..80ca6a350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### 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>