Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)
Feature/1087 wildcard option for blocks

Closes #1087

See merge request pleroma/pleroma!1467


Trivial merge