diff options
| author | lain <lain@soykaf.club> | 2020-09-23 10:49:29 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 10:49:29 +0000 |
| commit | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (patch) | |
| tree | 559fe96b7f65cd750a4bab5e9a117c43829c800f /CHANGELOG.md | |
| parent | 34235bc02a88718b1d5a9d7fa2437784b91bb692 (diff) | |
| parent | a6c14041c49df0dc850204723cfc1f242ded8aa2 (diff) | |
| download | pleroma-a5e1c400e49e7979e70f2c9dd4887ae144dca44c.tar.gz pleroma-a5e1c400e49e7979e70f2c9dd4887ae144dca44c.zip | |
Merge branch 'issue/1975' into 'develop'
[#1975] import emoji from a zip archive
Closes admin-fe#130
See merge request pleroma/pleroma!2911
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dc098f80..b17a0e999 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 @@ -31,7 +30,6 @@ switched to a new configuration mechanism, however it was not officially removed ### Fixed - Allow sending out emails again. - ## [2.1.2] - 2020-09-17 ### Security |