Resolve conflicts
authorRoman Chvanikov <chvanikoff@pm.me>
Thu, 6 Jun 2019 22:20:50 +0000 (01:20 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Thu, 6 Jun 2019 22:20:50 +0000 (01:20 +0300)
commit01fe5abad1a98b98a0dd5e3c04bf65809389fd78
treeb829b75c225b8ffbacd22884693a622dc7584a70
parentb1b1a270e8f17b76d08771ca1e4025b1d227da05
parent62cdf701f47352004c293c3ca049d232b3d16af7
Resolve conflicts
CHANGELOG.md
config/config.exs
config/test.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/user.ex
test/user_test.exs