repush and resolve conflicts

Browse Source

...

This commit is contained in:

Nucleareal 2020-10-01 22:35:06 +09:00

parent 42ae104e13

commit c19dfa89c9

1 changed files with 595 additions and 536 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

1129

translations/base-ja.yaml

View File

File diff suppressed because it is too large Load Diff