siyuan/app/appearance/langs
Vanessa c8055dbeee Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json
2023-09-10 15:32:54 +08:00
..
en_US.json Merge remote-tracking branch 'origin/dev' into dev 2023-09-10 15:32:54 +08:00
es_ES.json Merge remote-tracking branch 'origin/dev' into dev 2023-09-10 15:32:54 +08:00
fr_FR.json Merge remote-tracking branch 'origin/dev' into dev 2023-09-10 15:32:54 +08:00
zh_CHT.json Merge remote-tracking branch 'origin/dev' into dev 2023-09-10 15:32:54 +08:00
zh_CN.json Merge remote-tracking branch 'origin/dev' into dev 2023-09-10 15:32:54 +08:00