Fix merge conflict
authorrinpatch <rinpatch@sdf.org>
Fri, 18 Jan 2019 15:31:25 +0000 (18:31 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 18 Jan 2019 15:31:25 +0000 (18:31 +0300)
commit74346a7035d950ede143d65f8364194cb116aaf5
treef058b3fc2edd6868511bc6f832f75374bdbd117e
parenta38f21f51dc810221cbf910556910a10f6104956
parent98d9dcd509ab6823e38b3ddbce1f5fc4f3d5a82c
Fix merge conflict
config/config.exs
docs/config.md
lib/pleroma/formatter.ex
lib/pleroma/user.ex
lib/pleroma/web/router.ex