Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 5 Feb 2020 04:56:36 +0000 (07:56 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 5 Feb 2020 04:56:36 +0000 (07:56 +0300)
commite84fee5b8624c8909ddd8a7e0d99c6beea4f54d0
treed0d2bfc3d847f9bb4fa03f08d9d60f49042b2688
parent86e4d23acb640efea8cbc879ddbeadfa0e04f9c8
parenta56db789359c7c7d57b45e6c68f791eeadc171e4
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
config/config.exs
config/description.exs
lib/pleroma/activity.ex
test/web/activity_pub/transmogrifier_test.exs