Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-valid...
authorlain <lain@soykaf.club>
Tue, 4 Aug 2020 13:28:41 +0000 (15:28 +0200)
committerlain <lain@soykaf.club>
Tue, 4 Aug 2020 13:28:41 +0000 (15:28 +0200)
commit878c7f3f309aa5aaa9eababc2c863248dd4420bb
treee2c76471b95ee9460989aeedf4ebfa4843b11cba
parent0f088d8ce35150d7baa0591a25c831fce0181239
parent28584bb2241c600fc6150fdae49b1eea6bd420e0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation