Fix merge locales issue

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2020-10-01 16:13:07 +02:00
parent f5e6c648a4
commit 32ff3cb69b
23 changed files with 1013 additions and 1216 deletions

File diff suppressed because it is too large Load Diff