From: rinpatch <rinpatch@sdf.org>
Date: Wed, 11 Dec 2019 09:57:00 +0000 (+0000)
Subject: Merge branch 'domain-block-precedence' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=72f3b2213425b37ea6b493beb543cc1748e4ae79;hp=72f3b2213425b37ea6b493beb543cc1748e4ae79;p=akkoma

Merge branch 'domain-block-precedence' into 'develop'

make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019
---