Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
authorlain <lain@soykaf.club>
Tue, 5 Jan 2021 12:33:57 +0000 (13:33 +0100)
committerlain <lain@soykaf.club>
Tue, 5 Jan 2021 12:33:57 +0000 (13:33 +0100)
commitfee0c6a2cb058282ee6c3960730201f58b691270
tree9a5e0057d20651fbde1fe8180cabf7744a3a26ca
parent7b44605cb89943a905f6a0a7aab9ebeea58aa7ab
parent7a03b112f2ae0acbb546975a3cb57f63ab69708d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users