Merge branch 'master' into try_jp

Browse Source

# Conflicts:
#	README.md
#	module/ui/assets.py

...

This commit is contained in:

ferina8-14

2020-06-27 19:19:17 +09:00

parent f8e693f5ea 161dc39785

commit b44fc35f30

31 changed files with 738 additions and 199 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

BIN

assets/en/ui/MAIN_GOTO_RAID.BUTTON.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 9.1 KiB