diff options
| author | feld <feld@feld.me> | 2020-05-04 20:24:08 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-05-04 20:24:08 +0000 |
| commit | b1c29e2de8a02ef3093387c1454d290a92fbdef8 (patch) | |
| tree | 89156c38ea8b957fd04fd467db578d1e04a43230 /lib | |
| parent | 378ab2db97843112523985ca72b427702d50fe58 (diff) | |
| parent | 2ab52d52248224c61b857f2fc54adff80343e3c0 (diff) | |
| download | pleroma-b1c29e2de8a02ef3093387c1454d290a92fbdef8.tar.gz | |
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
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions