Resolve conflicts
authorRoman Chvanikov <chvanikoff@pm.me>
Fri, 28 Jun 2019 21:52:50 +0000 (00:52 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Fri, 28 Jun 2019 21:52:50 +0000 (00:52 +0300)
commit657277ffc0d3d25be4376ed629057a2d2cefb2e1
tree3fdd4ca236669df9b2afc5bfcd0e5d6002e23666
parentc0fa0001476a8a45878a0c75125627164497eddf
parentc6668c2e7b9908e479527914ca7eb2c838aaab06
Resolve conflicts
17 files changed:
CHANGELOG.md
config/config.exs
config/test.exs
docs/config.md
lib/mix/tasks/pleroma/digest.ex
lib/mix/tasks/pleroma/instance.ex
lib/pleroma/application.ex
lib/pleroma/emails/user_email.ex
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
priv/templates/sample_config.eex
test/notification_test.exs
test/support/factory.ex
test/user_test.exs