X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=CHANGELOG.md;h=8ea66844db4f6df543c5ba8e8d9ab5756088e833;hb=518c0f2962ab36660157d7cbc995d1f4562728b3;hp=5abafdf6911949226a9b355da11cb2f2c3d9c6d7;hpb=2159daa9af8967fe4b6d31e19c7048979b4cb165;p=akkoma

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5abafdf69..8ea66844d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Users with the `discoverable` field set to false will not show up in searches.
 - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
 
+### Added
+- Media preview proxy (requires media proxy 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.
+- Admin API: Importing emoji from a zip file
+
 ### Removed
 
 - **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation).
@@ -21,9 +27,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Removed `:managed_config` option. In practice, it was accidentally removed with 2.0.0 release when frontends were
 switched to a new configuration mechanism, however it was not officially removed until now.
 
-### Added
-- Pleroma API: Importing the mutes users from CSV files.
-
 ## [2.1.2] - 2020-09-17
 
 ### Security