Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 21 Apr 2020 05:20:50 +0000 (08:20 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 21 Apr 2020 05:20:50 +0000 (08:20 +0300)
commitbb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1
tree307120b8958a5be8dad4a16e6e2ff779336a30e3
parentf7e623c11c4b6f4f323a4317e9489092be73f9cd
parente57c1b60e4a0f882d5217bf1be8b1a7240aa322d
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
lib/pleroma/notification.ex
test/notification_test.exs