Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
authorlain <lain@soykaf.club>
Fri, 19 Jun 2020 12:56:50 +0000 (14:56 +0200)
committerlain <lain@soykaf.club>
Fri, 19 Jun 2020 12:56:50 +0000 (14:56 +0200)
commit7e488cd4a7ac038dfe8a1f5b204cb134bb5ba549
treea35a08cb24761e72c4be20b97a1833fdb26ca682
parent015f9258a9bd1430ab079f449b118b664c3b9664
parentd772361e6209e6b5733e9fe52b3671cd222060b3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator