Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Sun, 10 May 2020 10:32:57 +0000 (12:32 +0200)
committerlain <lain@soykaf.club>
Sun, 10 May 2020 10:32:57 +0000 (12:32 +0200)
1  2 
lib/pleroma/notification.ex

Simple merge