From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 8 Mar 2018 12:29:02 +0000 (+0000)
Subject: Merge branch 'feature/activitypub' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=460062f2b04220ffcd8f20aa842cc95582d1f849;p=akkoma

Merge branch 'feature/activitypub' into 'develop'

Feature/activitypub

See merge request pleroma/pleroma!67
---

460062f2b04220ffcd8f20aa842cc95582d1f849