Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2

Browse Source

# Conflicts:
#	common/src/main/res/values-en-rUS/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle

...

This commit is contained in:

ningwenqiang

2024-09-06 14:05:47 +08:00

parent d2662da0b7 4d6e38734d

commit a349e94bf3

50 changed files with 2025 additions and 598 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/ic_chat_type_select.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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