Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-valida...
authorlain <lain@soykaf.club>
Thu, 7 May 2020 12:45:35 +0000 (14:45 +0200)
committerlain <lain@soykaf.club>
Thu, 7 May 2020 12:45:35 +0000 (14:45 +0200)
commitcda410adfd55e8832ec9c0a553c5b28a1269904f
treea2bb3c81c1e43ff90e5aa5548e76342251d4766e
parentf0c22df2265e922a66ca69c3508fe812b8e20b6b
parentb7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced