Skip to content
Commit 5435e5d5 authored by Gerardo Pacheco's avatar Gerardo Pacheco
Browse files

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

# Conflicts:
#	android/src/main/java/com/brentvatne/react/ReactVideoView.java
parents 2f0b694b 570339bb
Expand all 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