Commit 3dc5f049 authored by kaniini's avatar kaniini
Browse files

Merge branch 'carrot-bullying' into 'develop'

Add some hard limits on inserted activities.

See merge request !595
parents dd8f2196 9c782e59
Pipeline #5823 passed with stages
in 3 minutes and 16 seconds