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)
commit589bffa57d30b1133f951d0a6788c6f956f798a6
treea68931474e5ebbbbacb7ae30747a0aa848441d97
parent31749559e178729e9f4c4211294de8d1e3e16516
parent6caf6a86c50fe3cb078d89b0f8ebcd7fd707bb23
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
docs/configuration/mrf.md