Merge branch 'feature/digest-email' into 'develop'
authorlain <lain@soykaf.club>
Thu, 8 Aug 2019 14:38:33 +0000 (14:38 +0000)
committerlain <lain@soykaf.club>
Thu, 8 Aug 2019 14:38:33 +0000 (14:38 +0000)
Feature/digest email

See merge request pleroma/pleroma!1078

1  2 
CHANGELOG.md
docs/config.md
test/support/factory.ex

diff --cc CHANGELOG.md
Simple merge
diff --cc docs/config.md
Simple merge
Simple merge