project.pbxproj
2.76 MB
The source could not be displayed because it is larger than 1 MB.
You can
load it anyway or download it
instead.
-
Merge branch 'feature/私享房老玩家分支' into feature/私享房需求 · 7a10d517
* feature/私享房老玩家分支: 完成除了网页链接打开进入直播间之外的其他进入直播间上报 完成老玩家回归直播间检测弹窗 接入两个分享 完成首冲和老玩家回归充值相关 完成老玩家回归次级页面 完成召回一级页面 完成注扫码册绑定相关 完成注册前绑定邀请人的准备 # Conflicts: # DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Models/FUSSettingConfigModel.h # Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist # Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist # Pods/Pods.xcodeproj/project.pbxproj
pidan committed