Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
authorlain <lain@soykaf.club>
Wed, 26 Aug 2020 13:58:49 +0000 (15:58 +0200)
committerlain <lain@soykaf.club>
Wed, 26 Aug 2020 13:58:49 +0000 (15:58 +0200)
commit5dba3a50fcdb673473315ec9e425e1cf5ad52c3e
tree60a8c52d8df1bf596ac44a47580354efba436153
parentfc42446755d5284a2406633358ab8edfa8c0ab0c
parent6f17aea066498bf070f0decb3ac0508c6b04e3b8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0