aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-11-11 21:13:09 +0000
committerShpuld Shpludson <shp@cock.li>2020-11-11 21:13:09 +0000
commitfa2884a8052bfe4f4d9d069ff9d1d15765c3bba8 (patch)
tree4584aae9853d2ba444323ad848ea76b09c70f0c0 /CHANGELOG.md
parent3e1c828ba9e3a20bbb613ffa3982516c35c3321d (diff)
parent6cdf347ed16547e09807b61d611ad35e640db95d (diff)
Merge branch 'chore/update-changelog-to-match-release' into 'develop'
Update develop changelog to contain 2.2.1 release See merge request pleroma/pleroma-fe!1286
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf9898a2..6e4bf822 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Fixed
-- Fixed regression in react popup alignment and overflowing
- Fixed the occasional bug where screen would scroll 1px when typing into a reply form
- Fixed custom emoji not working in profile field names
+## [2.2.1] - 2020-11-11
+### Fixed
+- Fixed regression in react popup alignment and overflowing
+
+
## [2.2.0] - 2020-11-06
### Added
- New option to optimize timeline rendering to make the site more responsive (enabled by default)