From: feld <feld@feld.me>
Date: Mon, 4 May 2020 20:24:08 +0000 (+0000)
Subject: Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b1c29e2de8a02ef3093387c1454d290a92fbdef8;p=akkoma

Merge branch 'feature/update-labels-for-activating-settings' into 'develop'

Fix inconsistency in language for activating settings in description.exs

Closes admin-fe#108

See merge request pleroma/pleroma!2469
---

b1c29e2de8a02ef3093387c1454d290a92fbdef8