huangjian 3b54e8a763 Merge branch 'yinyou_v5.5.1' into yinyou_develop ...

# Conflicts:
#	app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt
#	app/src/main/res/drawable-xhdpi/bg_new_user_gift.png

2022-12-06 17:21:19 +08:00

..

alipay-libs

66陪玩-origin

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

libs

踢出房间限制进房bugfix

2022-09-07 15:32:27 +08:00

src

Merge branch 'yinyou_v5.5.1' into yinyou_develop

2022-12-06 17:21:19 +08:00

.gitignore

66陪玩-origin

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

build.gradle

移除KTV相关代码

2022-12-02 16:12:02 +08:00

proguard-rules.pro

混淆规则统一

2021-06-09 14:04:19 +08:00