Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
authorlain <lain@soykaf.club>
Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)
committerlain <lain@soykaf.club>
Wed, 12 Aug 2020 10:53:04 +0000 (12:53 +0200)
commitbb92ad44a6e35c0d67a8f349bd55db4bbb6562cf
treea131779d9ac41ca1feec6d7b0750d90bf17aa1d5
parent500576dcb623bdc29193e3b372837c581e151755
parent86c18e4165f1b247af11360535a9daa6ce1641d3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject