Tags: iodefog/VipVideo
Tags
Merge branch 'master' of https://github.com/iodefog/VipVideo # Conflicts: # README.md # VipVideo.xcodeproj/project.pbxproj # VipVideo.xcodeproj/xcshareddata/xcschemes/VipVideo.xcscheme # VipVideo/Base.lproj/Main.storyboard # VipVideo/Helper/MainMenu.m # VipVideo/Helper/VipURLManager.h # VipVideo/Helper/VipURLManager.m # VipVideo/Helper/vlist.json # VipVideo/Home/HLHomeViewController.m