Vlyan 57a645f2e0 Merge branch 'dev' into dev_gennpc ...

# Conflicts:
#	system/styles/l5r5e.css
#	system/templates/actors/character/identity.html

2022-02-06 11:12:33 +01:00

..

en-en.json

Merge branch 'dev' into dev_gennpc

2022-02-06 11:12:33 +01:00

es-es.json

Merge branch 'dev' into dev_gennpc

2022-02-06 11:12:33 +01:00

fr-fr.json

Merge branch 'dev' into dev_gennpc

2022-02-06 11:12:33 +01:00