Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
authorlain <lain@soykaf.club>
Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
committerlain <lain@soykaf.club>
Wed, 26 Aug 2020 11:17:39 +0000 (13:17 +0200)
commitfc42446755d5284a2406633358ab8edfa8c0ab0c
tree16924be1f511166b4b1a5d91ce681696ee2a19f1
parent49a436ad3e174e1b0b6442f7a777498cc551449c
parent797535155051e75227fca611c3486c02c01a98b3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
.gitlab-ci.yml
CHANGELOG.md