Merge branch 'feature/activitypub' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 8 Mar 2018 12:29:02 +0000 (12:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 8 Mar 2018 12:29:02 +0000 (12:29 +0000)
commit460062f2b04220ffcd8f20aa842cc95582d1f849
treef56c298bed6b289aa2dd81766862265ccef05947
parent0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4
parent611ca385dea3d611a97579000311cc42684305e6
Merge branch 'feature/activitypub' into 'develop'

Feature/activitypub

See merge request pleroma/pleroma!67