Olgun Kaya 6c46dcffa8 Merge branch 'implement-ima-sdk' into master ... # Conflicts: # android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java # examples/basic/package.json # examples/basic/yarn.lock # ios/Video/RCTVideo.h # ios/Video/RCTVideo.m # ios/Video/RCTVideoManager.m # react-native-video.podspec		2021-06-15 15:42:07 +03:00
..
basic	Merge branch 'implement-ima-sdk' into master	2021-06-15 15:42:07 +03:00
embed-and-fullscreen	Fix missing layout calls in full-screen when using built-in video controls on iOS	2019-01-24 16:04:31 -08:00
video-caching	fix: omit packager assets from caching (#1438)	2019-01-24 13:15:58 +01:00