Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
authorfeld <feld@feld.me>
Mon, 4 May 2020 20:24:08 +0000 (20:24 +0000)
committerfeld <feld@feld.me>
Mon, 4 May 2020 20:24:08 +0000 (20:24 +0000)
commitb1c29e2de8a02ef3093387c1454d290a92fbdef8
tree89156c38ea8b957fd04fd467db578d1e04a43230
parent378ab2db97843112523985ca72b427702d50fe58
parent2ab52d52248224c61b857f2fc54adff80343e3c0
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
config/description.exs