Merge branch 'mastofe-f48f11d4' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 1 Apr 2018 09:51:34 +0000 (09:51 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 1 Apr 2018 09:51:34 +0000 (09:51 +0000)
update mastofe

See merge request pleroma/pleroma!90


Trivial merge