repush and resolve conflicts (#736)

Browse Source

...

This commit is contained in:

ぬくれあ

2020-10-02 18:14:24 +09:00

committed by GitHub

parent 1014c3462b

commit 62231168e4

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

Download Patch File Download Diff File Expand all files Collapse all files

1131

translations/base-ja.yaml

File diff suppressed because it is too large Load Diff