Merge branch 'domain-block-precedence' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 11 Dec 2019 09:57:00 +0000 (09:57 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 11 Dec 2019 09:57:00 +0000 (09:57 +0000)
commit72f3b2213425b37ea6b493beb543cc1748e4ae79
tree1b9071d740c072d5fbbc4e2848afa029ec1efe58
parent1f498ba2bb77a6dd103631d9de1e5c1bbfaaea10
parent1ad96d667ae2f8a14a0b7c701a99c7fa72985a00
Merge branch 'domain-block-precedence' into 'develop'

make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019