project.pbxproj
974 KB
-
Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本 · b394dc0e
# Conflicts: # FuSiLive.xcodeproj/project.pbxproj # FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
pierce committed