Vlyan 1928897a49 Merge branch 'dev' into 'myrion211-master-patch-79898' ...

# Conflicts:
#   system/lang/en-en.json

2021-01-24 12:22:06 +00:00

..

en-en.json

Merge branch 'dev' into 'myrion211-master-patch-79898'

2021-01-24 12:22:06 +00:00

es-es.json

Fix the plural of "Strife" is "Strife" not "Strives"

2021-01-23 14:01:33 +01:00

fr-fr.json

Fix the plural of "Strife" is "Strife" not "Strives"

2021-01-23 14:01:33 +01:00