pidan / FuSiLive

# Conflicts:
#	DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.h
#	DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
#	DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
#	FuSiLive/AppDelegate.m

* 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

* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  添加notificationserviceext

# Conflicts:
#	Podfile.lock
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig
#	Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive.release.xcconfig

mp4礼物

2、Mp4礼物相关的bug
3、fixed 背包礼物送完没有连送按钮的问题

* 'feature/邀请有奖' of http://git.yabolive.net:88/pidan/FuSiLive:
  修复一个注册agentcode的bug
  1、开放ipad 2、修复ATT弹窗弹不出来的问题

# Conflicts:
#	Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m