Merge branch 'develop' into feature/digest-email
authorRoman Chvanikov <chvanikoff@pm.me>
Wed, 24 Jul 2019 13:37:52 +0000 (16:37 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Wed, 24 Jul 2019 13:37:52 +0000 (16:37 +0300)
commitd2da3d30f3349946500423bab53e0c1221ab7b9b
tree338d2e3b0412a9be89a462173e367495c5e9ad40
parentafc7708dbe00a70be616f00f01b22b0d01b9b61b
parent53fad36b57b61b28db595e445cd01fd6044dab6b
Merge branch 'develop' into feature/digest-email
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/notification_test.exs
test/support/factory.ex
test/user_test.exs