Merge branch 'master' into dev

Browse Source

# Conflicts:
#	module/os/assets.py

...

This commit is contained in:

LmeSzinc 2021-04-13 19:54:31 +08:00

parent 9990825b8c 2220961e62

commit 1482343a7b

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

BIN

assets/jp/os/MAP_GOTO_GLOBE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 32 KiB