From: kaniini <nenolod@gmail.com>
Date: Fri, 26 Oct 2018 19:03:49 +0000 (+0000)
Subject: Merge branch 'update-pleroma-frontend' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=310a4bc25cf4b30a1c49a2eece9141d2314b11db;p=akkoma

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

update pleroma frontend

See merge request pleroma/pleroma!396
---

310a4bc25cf4b30a1c49a2eece9141d2314b11db