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
..
RCTVideo.xcodeproj	change deployment target to 9.0	2019-12-10 11:47:48 +07:00
Video	Merge branch 'implement-ima-sdk' into master	2021-06-15 15:42:07 +03:00
VideoCaching	Code style cleanups	2018-08-08 15:34:07 -07:00