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)
commitdfde2622d0c14195392e306fadc7c729c68da273
tree1be5f183475db92bac294e453c3bebb67492786d
parentf5d7b0003ea200d13abca2cbd4e4f59db9658231
parentf40562b4e1ff213b88c8b6edf57431bfb1b804ac
Merge branch 'activitypub-c2s' into 'develop'

Activitypub c2s

See merge request pleroma/pleroma!608