Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 14 Apr 2020 17:10:02 +0000 (20:10 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 14 Apr 2020 17:10:02 +0000 (20:10 +0300)
commit0cda80f266c03557b47112e52bfe748655b4321c
tree3066cf037c65cd8a19aa0228cb75ec6acc94d870
parent650853fc895fb2e21eac347e056eab98b842a3b7
parent6c3e09fbce823fe1ddef96a4a1ec54d67ceeec50
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