Merge pull request #11103 from vector-im/dbkr/olm_session_describe

Bump Olm to 3.1.4 for olm_session_describe
element-hq · Oct 9, 2019 · d903214 · d903214
2 parents 56c0d3e + b6d1d0b
commit d903214
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.6.0",
-    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "prop-types": "^15.7.2",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",

diff --git a/yarn.lock b/yarn.lock
@@ -6679,9 +6679,9 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-"olm@https://packages.matrix.org/npm/olm/olm-3.1.0.tgz":
-  version "3.1.0"
-  resolved "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz#2c8fc2a42b7ea12febc31baa73ec03d9b601da16"
+"olm@https://packages.matrix.org/npm/olm/olm-3.1.4.tgz":
+  version "3.1.4"
+  resolved "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz#0f03128b7d3b2f614d2216409a1dfccca765fdb3"
 
 on-finished@~2.3.0:
   version "2.3.0"