Merge branch 'develop' into feature/digest-email
authorRoman Chvanikov <chvanikoff@pm.me>
Fri, 2 Aug 2019 15:16:04 +0000 (18:16 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Fri, 2 Aug 2019 15:16:04 +0000 (18:16 +0300)
commit9d4f34fbcb1a8e2eca424b3a3374c9f9af972574
treec5943eb5d2652e08cc12d0b58a992376c425e66d
parentd2da3d30f3349946500423bab53e0c1221ab7b9b
parent5ff8f07ca906d77a6ec1d5ba912a787f855364f9
Merge branch 'develop' into feature/digest-email
CHANGELOG.md
config/config.exs
config/test.exs
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/notification_test.exs
test/user_test.exs