Max cfc909df42 Merge branch 'v2.2.0/float_gift' into v2.2.0/test ...

# Conflicts:
#	app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
#	app/src/main/res/layout/dialog_gift_all_service_level.xml
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml

2023-10-28 12:56:42 +08:00

..

src

Merge branch 'v2.2.0/float_gift' into v2.2.0/test

2023-10-28 12:56:42 +08:00

.gitignore

…

build.gradle

debug 混淆配置; 升级eventbus

2023-10-19 14:46:11 +08:00

google-services.json

[Modify]修改google,facebook的登录配置

2023-03-20 17:50:47 +08:00

proguard-rules.pro

混淆 bean

2023-10-19 15:00:22 +08:00

resource_mapping.txt

…