Resolve merge conflict
authorrinpatch <rinpatch@sdf.org>
Sun, 13 Jan 2019 10:38:28 +0000 (13:38 +0300)
committerrinpatch <rinpatch@sdf.org>
Sun, 13 Jan 2019 10:38:28 +0000 (13:38 +0300)
commite4dc3f71aea900e566c0d66ddffc5cd57e3920dd
treed0b0edfd3c7aa4c2015b0b461a4c40895e16eba9
parent9a6236e69d2709c0df374574fd77c4b2bc3d68fb
parent19b6a8239387869c69c6885044ee488d097b723f
Resolve merge conflict
config/config.exs
lib/pleroma/formatter.ex
lib/pleroma/user.ex
lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex
mix.exs
test/web/ostatus/ostatus_controller_test.exs