Merge branch 'master' into bug_fix

Browse Source

# Conflicts:
#	module/os_ash/assets.py

...

This commit is contained in:

LmeSzinc

2022-07-17 01:26:33 +08:00

parent f7d50a5306 3fee4a8f44

commit e98e9d42ef

3 changed files with 1 additions and 1 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/jp/os_ash/BEACON_ENTER.BUTTON.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 86 KiB After Width:  |  Height:  |  Size: 98 KiB

BIN

assets/jp/os_ash/BEACON_ENTER.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.3 KiB After Width:  |  Height:  |  Size: 11 KiB