Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix...
authorMark Felder <feld@FreeBSD.org>
Fri, 14 Feb 2020 17:06:04 +0000 (11:06 -0600)
committerMark Felder <feld@FreeBSD.org>
Fri, 14 Feb 2020 17:06:04 +0000 (11:06 -0600)
1  2 
docs/configuration/mrf.md

Simple merge