Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 7 Apr 2018 14:41:47 +0000 (16:41 +0200)
committerlain <lain@soykaf.club>
Sat, 7 Apr 2018 14:41:47 +0000 (16:41 +0200)
commit8f9bcc4ab0b16efa9168f49f6e2cc14bc424d398
tree220581b9c5d2dd92285943c2b948789b9bf4699c
parent70bcdf32bdf98c02d9f44c07cbcf74d4c59ed299
parentd41bfd1d47587c95450c5953b9fb4374008ecb8c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop