zlzw c1c8921f59 Merge branch 'dev_6.5.2' ... # Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java		2023-05-17 16:20:10 +08:00
..
assets	贵族开通全服通知	2022-11-23 13:42:55 +08:00
java/com/yunbao/common	Merge branch 'dev_6.5.2'	2023-05-17 16:20:10 +08:00
jniLibs	androidx版本首次提交	2022-07-18 15:31:45 +08:00
res	Merge branch 'dev_6.5.2'	2023-05-17 16:20:10 +08:00
AndroidManifest.xml	移除AliPay代码	2022-12-05 17:41:42 +08:00