Merge branch 'block-handling' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 26 Jun 2020 17:41:00 +0000 (17:41 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 26 Jun 2020 17:41:00 +0000 (17:41 +0000)
commitbf1c5e255ae0ab297aac3094d6a899c24c29fd2f
treeb61c301b4daa6bcb9633dedf09f687d69cf6edf1
parent09478c9cf713eefdfdf585f0196efdf00b9c0baf
parent15a8b703185c685fc3d25a381fcb9dee522c78bf
Merge branch 'block-handling' into 'develop'

Handle blocks with the pipeline

See merge request pleroma/pleroma!2685