From: lambda <pleromagit@rogerbraun.net>
Date: Sat, 31 Mar 2018 19:33:17 +0000 (+0000)
Subject: Merge branch 'new-mastofe' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5fa8237bc1dcabca050dc5d8d9325fec649e1723;p=akkoma

Merge branch 'new-mastofe' into 'develop'

Bring Mastodon frontend up-to-date

See merge request pleroma/pleroma!87
---

5fa8237bc1dcabca050dc5d8d9325fec649e1723