Merge branch 'master' into app

Browse Source

# Conflicts:
#	module/config/config.py
#	module/reward/reward.py

...

This commit is contained in:

LmeSzinc

2021-09-30 21:26:25 +08:00

parent 8780477758 57af3bcc83

commit 38f55a3a26

48 changed files with 435 additions and 5 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/REWARD_GOTO_MAIN.png

Binary file not shown.

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