project.pbxproj
981 KB
-
Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本 · 61dc6903
# Conflicts: # DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/FUSBaseViewController.m # FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangBroadcastModel.m # FuSiLive/Classes/Common/MainControllerHelper/FUSMainViewControllerHelper.m # FuSiLive/Classes/NewLive/Main/Other/FUSLiveHelper.m # FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/LiveUserListView/FUSLiveUserCollectionViewCell.m
pierce committed