resolve conflict, replace w akkoma fe develop

Browse source

...

This commit is contained in:

qbism 2023-08-01 01:38:44 -04:00

parent 789bab93a6

commit 6a704a5167

2 changed files with 2128 additions and 2126 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

1839

src/i18n/ja_easy.json

View file

File diff suppressed because it is too large Load diff

2415

src/i18n/zh.json

View file

File diff suppressed because it is too large Load diff