From: kaniini <nenolod@gmail.com>
Date: Sun, 30 Dec 2018 19:50:15 +0000 (+0000)
Subject: Merge branch 'activitypub-c2s' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dfde2622d0c14195392e306fadc7c729c68da273;p=akkoma

Merge branch 'activitypub-c2s' into 'develop'

Activitypub c2s

See merge request pleroma/pleroma!608
---

dfde2622d0c14195392e306fadc7c729c68da273