Merge branch 'feature/mrf-transparency-opt-out' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Sun, 7 Oct 2018 01:34:16 +0000 (01:34 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Sun, 7 Oct 2018 01:34:16 +0000 (01:34 +0000)
commit5294b11ef092df386b29896e47795edac8364f20
tree241045eb79c9a21507dc1d008ca4624cb4412f60
parent4a3a46074d924f6cd61d06995298caa00184ff18
parent08d5ad71b68e44334911c63aada418fab2c17df2
Merge branch 'feature/mrf-transparency-opt-out' into 'develop'

nodeinfo: allow opting out of MRF transparency

See merge request pleroma/pleroma!370