Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
authorMark Felder <feld@FreeBSD.org>
Tue, 8 Sep 2020 14:31:26 +0000 (09:31 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 8 Sep 2020 14:31:26 +0000 (09:31 -0500)
commit21efda2edbfa74e80ad0df6f92b52a16880082e3
tree2c7877d17a3b038a554e429012478a4665f1eed3
parent5d814f739cd2bb55822e0cfdb9ad2526d10482bb
parent0a05670b4499d170f6bc0eaecfae0d71be022227
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
CHANGELOG.md
config/description.exs
docs/configuration/cheatsheet.md