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)
commitc272669909c4ea5b99affe61a90d5a7967656377
tree02312116ab39e4b2ee3de7cfc38d863ba86da6e9
parent1054e897622d0a0727f30169d64c83a253a3d11e
parent7ca83e71a91d6fbce672f8b3eed087a628bb0bb2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/notification.ex