From: Roman Chvanikov <chvanikoff@pm.me>
Date: Wed, 23 Sep 2020 10:56:50 +0000 (+0300)
Subject: Merge develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8f5589cf667d8dd24da07e58db94225d81a55a7b;p=akkoma

Merge develop
---

8f5589cf667d8dd24da07e58db94225d81a55a7b
diff --cc CHANGELOG.md
index 9fd5f9efe,b17a0e999..770bd13f0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,6 -15,9 +15,10 @@@ The format is based on [Keep a Changelo
  
  ### 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
++- User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
  
  ### Removed