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
..
2018-08-08 15:34:07 -07:00