Skip to content
Snippets Groups Projects
Commit 72f3b221 authored by rinpatch's avatar rinpatch :speech_balloon:
Browse files

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

make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019
parents 1f498ba2 1ad96d66
Branches
No related tags found
No related merge requests found
Pipeline #20991 failed
Stage: build
Stage: test
Stage: benchmark
Stage: deploy
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment