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

…native-video into fix/report_time_position_when_updated # Conflicts: # CHANGELOG.md # android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
mizutani256 · Jun 15, 2022 · 48870e3 · 48870e3
2 parents a019f25 + 69631e8
commit 48870e3
Show file tree

Hide file tree

Showing 160 changed files with 12,017 additions and 9,661 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+Pods
 
 # Android/IJ
 #
@@ -29,6 +30,9 @@ project.xcworkspace
 .gradle
 local.properties
 *.hprof
+.project
+.settings
+.classpath
 
 # node.js
 #
@@ -46,3 +50,7 @@ buck-out/
 \.buckd/
 android/app/libs
 android/keystores/debug.keystore
+
+# windows
+Deploy.binlog
+msbuild.binlog