Skip to content
Commit 8c05762b authored by Daniel Mariño's avatar Daniel Mariño
Browse files

Merge branch 'react-native-video/master' into feature/android-pip 

# Conflicts:
#	CHANGELOG.md
#	android-exoplayer/build.gradle
#	android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
#	package.json
parents 42f98032 b675e591
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