Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
authorlain <lain@soykaf.club>
Mon, 26 Oct 2020 15:30:48 +0000 (16:30 +0100)
committerlain <lain@soykaf.club>
Mon, 26 Oct 2020 15:30:48 +0000 (16:30 +0100)
commit9542c5d0f4a9275a1f45182afbf1923a294cbdac
tree737ebfe79ea5580e764875d8cf2e3768427446ed
parenta999e8b0b73372ed129c5a26acfe73e5f7478c5b
parente6dab6513da0dcab19179b1a3448c0cce0c9f206
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name