From: kaniini <nenolod@gmail.com>
Date: Sun, 7 Oct 2018 01:09:33 +0000 (+0000)
Subject: Merge branch 'update-pleroma-frontend' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a15eac05a65d04b985505e0a284fe861a1da270d;p=akkoma

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

update-pleroma-frontend

See merge request pleroma/pleroma!369
---

a15eac05a65d04b985505e0a284fe861a1da270d