Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
authorlain <lain@soykaf.club>
Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
committerlain <lain@soykaf.club>
Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)
commit39bcf93007a5a52ba374099d6b04692361e7fa9b
tree358becb7f089c62d9f2a2634ca766ee7e7bad3f3
parentfd07745d1b18e2a1eeb88a99eaa9d5e728d1aa71
parent180b87257cae481d4d9ffc9f03a06268ad8df569
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
lib/pleroma/web/activity_pub/utils.ex
test/web/activity_pub/activity_pub_test.exs