Merge branch 'develop' into issue/1411
authorMaksim Pechnikov <parallel588@gmail.com>
Sun, 1 Dec 2019 13:18:16 +0000 (16:18 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sun, 1 Dec 2019 13:18:16 +0000 (16:18 +0300)
commit88f7cf51d43181b27db5ff1807d3e706fa336bac
tree3c3f8ba3b7685290e26c3582eeba7ba55ca1d10b
parent708fd234bdff5423ca6d8003232eca0df231bbc2
parent0d24ab04c5ea779432b4ea174a1d470dac87315d
Merge branch 'develop' into issue/1411
lib/pleroma/object.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs