Ash Mishra 0580f2710f Merge branch 'master' of https://github.com/nfb-onf/react-native-video ... # Conflicts: # ios/RCTVideoPlayerViewController.m # ios/Video/RCTVideo.m		2018-09-04 15:26:56 -07:00
..
RCTVideo.xcodeproj	fix xcode project paths	2018-07-31 07:07:13 +02:00
Video	Merge branch 'master' of https://github.com/nfb-onf/react-native-video	2018-09-04 15:26:56 -07:00
VideoCaching	Code style cleanups	2018-08-08 15:34:07 -07:00