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)
commit4a8b5226393752e1533bddce6420f3622a5be99f
treed613f6ff88b2886876dab78475a0dce5bd69ec2b
parent674ad5e1df0a001455090279229f186cbbdf1c94
parentb70e659304ba35f7afc598c3d3d1b96fa16f6cdf
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'

Feature/1087 wildcard option for blocks

Closes #1087

See merge request pleroma/pleroma!1467