Merge branch 'master' into dev_random_pk

Browse Source

# Conflicts:
#	live/src/main/res/values/strings.xml

...

This commit is contained in:

zlzw

2022-12-05 17:46:57 +08:00

parent ed6b531b8d 2a2672587c

commit 9ead9a6fb8

207 changed files with 7020 additions and 3152 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

common/src/main/res/mipmap-xxhdpi/btn_icon_quit.png Normal file

Binary file not shown.

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