Merge branch 'develop' into feature/digest-email
authorRoman Chvanikov <chvanikoff@pm.me>
Sun, 14 Jul 2019 18:43:30 +0000 (21:43 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Sun, 14 Jul 2019 18:43:30 +0000 (21:43 +0300)
commitc729883936c7d258cb670929af9577aec3e22851
tree17aec90897b221c000be1992001967a3861a6c10
parent0384459ce552c50edb582413808a099086b6495e
parent93701c3399add8af2d4a5d43b6f171d84655a533
Merge branch 'develop' into feature/digest-email
CHANGELOG.md
config/config.exs
docs/config.md
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/router.ex
test/notification_test.exs
test/user_test.exs