Skip to content
Commit 0580f271 authored by Ash Mishra's avatar Ash Mishra
Browse files

Merge branch 'master' of https://github.com/nfb-onf/react-native-video 

# Conflicts:
#	ios/RCTVideoPlayerViewController.m
#	ios/Video/RCTVideo.m
parents 77c48c9d 7b8f79b3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment