Merge remote-tracking branch 'origin/develop' into pool-usage
authorlain <lain@soykaf.club>
Tue, 1 Jan 2019 13:19:55 +0000 (14:19 +0100)
committerlain <lain@soykaf.club>
Tue, 1 Jan 2019 13:19:55 +0000 (14:19 +0100)
commit096a92780541e76229400ad9ee5b990b5e1b4d1f
treeac8a34ef7b89c7fe7bb5d97ee9994889a7667414
parent91afbbe4ea76a8af0072682d26a921aab9f64671
parent90e157ef803296989b41d1fbfb5096b39320f75d
Merge remote-tracking branch 'origin/develop' into pool-usage
lib/pleroma/http/connection.ex
lib/pleroma/http/http.ex
lib/pleroma/web/activity_pub/activity_pub.ex