Merge branch 'develop' into issue/1276
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 24 Oct 2019 06:23:59 +0000 (09:23 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 24 Oct 2019 06:23:59 +0000 (09:23 +0300)
1  2 
lib/pleroma/notification.ex
test/notification_test.exs

Simple merge
Simple merge