[#534] Merged `upstream/develop`.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 28 Jan 2019 12:39:14 +0000 (15:39 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 28 Jan 2019 12:39:14 +0000 (15:39 +0300)
commitd3f9e6f6fed382ede8e314c370c21e84a119f65a
treec8cd63007993d25bb8c17b5b83e8761db9de3295
parent1d2f41642cfec5710055bcf8409778bb362beecb
parentde0fb88a9cf587b9613e267d5dddfe55b0f414b7
[#534] Merged `upstream/develop`.
config/config.exs
docs/config.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/ostatus/ostatus_controller.ex
test/support/http_request_mock.ex
test/web/activity_pub/activity_pub_test.exs
test/web/ostatus/ostatus_controller_test.exs