Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 2 Apr 2018 17:05:02 +0000 (17:05 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 2 Apr 2018 17:05:02 +0000 (17:05 +0000)
commit925fb2f8717c1d7aa9be03be96fcaaed54a9f839
tree98aa319550442c69f4769c31e9c4448ca3a08481
parentb3b7ab5d9a0528bdfa385bd61d7f97ae4c7de374
parent676f2ca479fffc68b59b367fc279fd177a1c2fdf
Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'

Bring mastofe up to date

See merge request pleroma/pleroma!93