diff options
| author | lain <lain@soykaf.club> | 2020-09-23 10:57:53 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 10:57:53 +0200 |
| commit | 518c0f2962ab36660157d7cbc995d1f4562728b3 (patch) | |
| tree | 8516ec23b308d71fa7a240151993d55307b5d5cf | |
| parent | 8e4f043ac72e4236f5690f34e3bdc7ce288005e6 (diff) | |
| download | pleroma-518c0f2962ab36660157d7cbc995d1f4562728b3.tar.gz | |
Changelog: Add info about emoji zip import feature
| -rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e61b1d144..8ea66844d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased -### Added -- Experimental websocket-based federation between Pleroma instances. - ### Changed - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated. @@ -19,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### 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 @@ -28,7 +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. - ## [2.1.2] - 2020-09-17 ### Security |