update changelog

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1266d2dfebb4c3ddbbbe9353b96d4ac1dd61f418..5abafdf6911949226a9b355da11cb2f2c3d9c6d7 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
 - 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).
+
 ### Removed
 
 - **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation).
@@ -20,6 +21,9 @@ 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

diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md
index 567ad573236cf23a1d284d3066af043d8d49fede..94b6a4fda5195e7f7b355a489e25136fe33766a6 100644 (file)
--- a/docs/API/pleroma_api.md
+++ b/docs/API/pleroma_api.md
@@ -60,7 +60,6 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi
     * `list`: STRING or FILE containing a whitespace-separated list of accounts to mute
 * Response: HTTP 200 on success, 500 on error
 
-
 ## `/api/pleroma/captcha`
 ### Get a new captcha
 * Method: `GET`