Fix conflict
authorRoman Chvanikov <roman@Romans-MacBook-Pro-2.local>
Tue, 4 Jun 2019 23:45:21 +0000 (02:45 +0300)
committerRoman Chvanikov <roman@Romans-MacBook-Pro-2.local>
Tue, 4 Jun 2019 23:45:21 +0000 (02:45 +0300)
commitb1b1a270e8f17b76d08771ca1e4025b1d227da05
tree41a5896012a3f55f3de31f7ec97dc397ba02cd62
parentf6036ce3b9649902ce1c2af819616ad25f0caef1
parent5188add534a1532ef323a0fec3503f8e96dfe762
Fix conflict
CHANGELOG.md
config/config.exs
docs/config.md
lib/pleroma/user/info.ex
mix.exs