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)
commit7130e9ddb16286efd7d01088e816f05e82cfa2a1
tree497bacf216bcbdf19bd37e00fef778306715b348
parent24296047dc03cf97c2441d8d0b432aa58d333480
parent6d204103147af174ba6cc36f7af2f5b520ba69a0
Merge branch 'mastofe-f48f11d4' into 'develop'

update mastofe

See merge request pleroma/pleroma!90