From: kaniini <nenolod@gmail.com>
Date: Sun, 26 Aug 2018 20:18:16 +0000 (+0000)
Subject: Merge branch 'update-pleroma-frontend' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=inline;h=3448b434f54e8b4749524e3ccd876359a6501845;p=akkoma

Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!298
---

3448b434f54e8b4749524e3ccd876359a6501845