projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 378ab2d 2ab52d5)
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)
Fix inconsistency in language for activating settings in description.exs

Closes admin-fe#108

See merge request pleroma/pleroma!2469

1  2 
config/description.exs patch | diff1 | diff2 | blob | history

diff --cc config/description.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git