diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-11 09:57:00 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-11 09:57:00 +0000 |
| commit | 72f3b2213425b37ea6b493beb543cc1748e4ae79 (patch) | |
| tree | 1b9071d740c072d5fbbc4e2848afa029ec1efe58 /rel | |
| parent | 1f498ba2bb77a6dd103631d9de1e5c1bbfaaea10 (diff) | |
| parent | 1ad96d667ae2f8a14a0b7c701a99c7fa72985a00 (diff) | |
| download | pleroma-72f3b2213425b37ea6b493beb543cc1748e4ae79.tar.gz | |
Merge branch 'domain-block-precedence' into 'develop'
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions