Merge develop

diff --cc CHANGELOG.md
index 9fd5f9efe5c96e715b2e53ecf8e7edc0bc741eef,b17a0e999d8a5c2cbfd326e7c062ed2fdb07e5e3..770bd13f06090e01d9d951c7de5c3ac7622c1d43
--- 1/CHANGELOG.md
--- 2/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
  

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc test/notification_test.exs
Simple merge

diff --cc test/user_test.exs
Simple merge