Merge branch 'security/activitypub-spoofing' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 1 Sep 2018 23:48:55 +0000 (23:48 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 1 Sep 2018 23:48:55 +0000 (23:48 +0000)
security: activitypub spoofing

See merge request pleroma/pleroma!321


Trivial merge