diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-11-11 20:58:47 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-11-11 20:58:47 +0000 |
| commit | fb5d3d32927cd9ad625203c84e8826a3544fda3e (patch) | |
| tree | 5b87324d2fbd357905f75875e9c8c15b780de32f /CHANGELOG.md | |
| parent | 1d2ba946b6b81dc225d0eec21548a737ca2fac5e (diff) | |
| parent | 3e1c828ba9e3a20bbb613ffa3982516c35c3321d (diff) | |
Merge branch 'develop' into 'fix/timeline-error-handling-fixes'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a6b62bfe..18c1cf3b 100644 --- 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/). ### Changed - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers +- Fixed custom emoji not working in profile field names ## [2.2.0] - 2020-11-06 |