Resolve conflicts
authorRoman Chvanikov <chvanikoff@gmail.com>
Wed, 17 Apr 2019 09:59:05 +0000 (16:59 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Wed, 17 Apr 2019 09:59:05 +0000 (16:59 +0700)
commit2f0203a4a1c7a507aa5cf50be2fd372536ebfc81
tree8219ebfbfffb47ffff5649dfe428c501a4ccb089
parent87013f843853250e8b15696900e09afb92d22aac
Resolve conflicts
config/config.exs
lib/pleroma/user.ex
mix.exs
mix.lock
test/notification_test.exs