From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Thu, 31 Jan 2019 10:16:11 +0000 (+0000)
Subject: Merge branch 'features/glitch-soc-frontend' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=00d43333735acbcadc1dd04ff793f4ce6e8eecb1;p=akkoma

Merge branch 'features/glitch-soc-frontend' into 'develop'

Features/glitch soc frontend

See merge request pleroma/pleroma!192
---

00d43333735acbcadc1dd04ff793f4ce6e8eecb1