Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 14 Apr 2020 08:58:38 +0000 (11:58 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 14 Apr 2020 08:58:38 +0000 (11:58 +0300)
commit650853fc895fb2e21eac347e056eab98b842a3b7
tree7df844177fb8aa12057c6a0693b2bd04ca17807a
parent99b0bc198921099816a5f809f11a7579b3993274
parent60cc7d6c9a2ec60c3a98f0fe51d68d3dbd5d21c2
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users

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