zlzw 17decb63fa Merge remote-tracking branch 'origin/master' ... # Conflicts: # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml		2023-05-17 16:48:02 +08:00
app	fix修复line支付无法唤起app的问题	2023-05-08 14:04:43 +08:00
baidu
beauty	多语言切换	2023-04-18 10:30:55 +08:00
common	Merge remote-tracking branch 'origin/master'	2023-05-17 16:48:02 +08:00
FaceUnity
gradle/wrapper
lib_country_code	新增通过后端获取国家地区信息接口在注册时自动填写号码编号	2023-04-03 15:15:50 +08:00
libs
live	Merge branch 'dev_6.5.2'	2023-05-17 16:20:10 +08:00
main	Merge branch 'dev_6.5.2'	2023-05-17 16:20:10 +08:00
Share	多语言切换	2023-04-19 14:02:45 +08:00
video	修改，中英文问题（聊天框的中英文修改）	2023-04-25 15:24:57 +08:00
.gitignore
build.gradle
config.gradle	新增【非贵族，守护，粉丝牌送礼交互优化】功能	2023-05-10 14:31:15 +08:00
dependencies.gradle
gradle.properties
gradlew
gradlew.bat
hdl.jks
settings.gradle	update	2023-03-21 18:20:11 +08:00