Merge branch 'master' into app

Browse Source

# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py

...

This commit is contained in:

LmeSzinc

2021-09-17 23:53:15 +08:00

parent 61cbe75527 ae6809c9aa

commit 5ed75c8de5

37 changed files with 1379 additions and 43 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/ui/META_CHECK.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.9 KiB