Merge branch 'develop' into feature/digest-email
authorMark Felder <feld@FreeBSD.org>
Mon, 3 Jun 2019 20:29:53 +0000 (15:29 -0500)
committerMark Felder <feld@FreeBSD.org>
Mon, 3 Jun 2019 20:29:53 +0000 (15:29 -0500)
commit6ef145b4fc3f2ddb5865e84039c3b56656529711
treea10cab9e7561bdaa76777cfc6d0c3c6fe1f8189b
parent5cee2fe9fea4f0c98acd49a2a288ecd44bce3d1f
parent662e95e9484a46bfc72c2edc305aefae99ff68b0
Merge branch 'develop' into feature/digest-email
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