huangjian c20f3edd43 Merge branch 'yinyou_v3.6.4' into yinyou_develop ...

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
#	app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt
#	app/src/main/res/layout/layout_room_pk_board_view.xml
#	core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
#	core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java

2021-12-13 19:07:29 +08:00

..

src

Merge branch 'yinyou_v3.6.4' into yinyou_develop

2021-12-13 19:07:29 +08:00

.gitignore

66陪玩-origin

2020-04-02 10:43:40 +08:00

build.gradle

同意隐私协议签不初始化任何东西

2021-12-10 15:30:58 +08:00

proguard-rules.pro

66陪玩-origin

2020-04-02 10:43:40 +08:00