Gerardo Pacheco 5435e5d545 Merge branch 'master' of https://github.com/react-native-community/react-native-video
# Conflicts:
#	android/src/main/java/com/brentvatne/react/ReactVideoView.java
2018-07-25 09:58:46 +02:00
..