Merge branch 'activitypub-c2s' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 30 Dec 2018 19:50:15 +0000 (19:50 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 30 Dec 2018 19:50:15 +0000 (19:50 +0000)
Activitypub c2s

See merge request pleroma/pleroma!608


Trivial merge