Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Fri, 30 Mar 2018 12:48:08 +0000 (14:48 +0200)
committerlain <lain@soykaf.club>
Fri, 30 Mar 2018 12:48:08 +0000 (14:48 +0200)
commit480932c8e524e1a80c9c8ef1a1aa23379f633afe
tree4b15635ab57c6641aa41dc7ba862faac40abe985
parentc1d529ee9491fc0040cd4327c783aabf76cb66a8
parentb9ee17a8531e029dda2fa112e0cf814305808ec9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop