From: kaniini <nenolod@gmail.com>
Date: Sat, 29 Dec 2018 11:46:06 +0000 (+0000)
Subject: Merge branch 'carrot-bullying' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3dc5f04976293fbcedfc01281f89c4f54c995d59;p=akkoma

Merge branch 'carrot-bullying' into 'develop'

Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
---

3dc5f04976293fbcedfc01281f89c4f54c995d59