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)
Bring mastofe up to date

See merge request pleroma/pleroma!93


Trivial merge