diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
| commit | e7fb593d130e0ad62e3690dce4a0913fe3d40ef0 (patch) | |
| tree | 8edbc679acda1e5e024884c12cbceb2509417033 /CHANGELOG.md | |
| parent | b03aeae8b935b0a211c51cc3be5f1c15591f5a2f (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.tar.gz pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# 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 323ebdbe5..27746726e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Support pagination in conversations API - **Breaking**: SimplePolicy `:reject` and `:accept` allow deletions again +- Fix follower/blocks import when nicknames starts with @ - Filtering of push notifications on activities from blocked domains ## [unreleased-patch] |