diff options
| author | lain <lain@soykaf.club> | 2020-09-23 11:49:19 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 11:49:19 +0000 |
| commit | 436d1a3c41fc92183efffb81cc041ca270025d02 (patch) | |
| tree | a5a8cbe6911ef067c3d38a360897b390f6a855ff /CHANGELOG.md | |
| parent | df1eb5cf7ee6d718a28fca3d3715f11ab0e263cb (diff) | |
| parent | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff) | |
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e0982b83c..5f5d01af3 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 @@ -29,7 +28,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). switched to a new configuration mechanism, however it was not officially removed until now. ### Fixed + - Add documented-but-missing chat pagination. +- Allow sending out emails again. ## [2.1.2] - 2020-09-17 |