Merge remote-tracking branch 'upstream/master' into implement-ios-caching

2018-08-06 10:39:39 +02:00
parent 38ba3735ed ba159c3fa7
commit 8fcdc6e02a
11 changed files with 114 additions and 21 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "react-native-video",
-    "version": "3.1.0",
+    "version": "3.2.0",
    "description": "A <Video /> element for react-native",
    "main": "Video.js",
    "license": "MIT",