From: kaniini <nenolod@gmail.com>
Date: Mon, 3 Dec 2018 06:03:09 +0000 (+0000)
Subject: Merge branch 'update-pleroma-frontend' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a3f9cca78c16026025f0cbadc50c7683d7444e86;p=akkoma

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

update-pleroma-frontend

See merge request pleroma/pleroma!494
---

a3f9cca78c16026025f0cbadc50c7683d7444e86