gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9550 from uhoreg/olm-3.1.0 

use the release version of olm 3.1.0
This commit is contained in:
Hubert Chathi 2019-04-24 18:19:22 -04:00 committed by GitHub
parent 597b3e16e0 2c64a4f3a1
commit 8ef464597f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -76,7 +76,7 @@
"matrix-js-sdk": "1.0.4", "matrix-js-sdk": "1.0.4",
"matrix-react-sdk": "1.0.7", "matrix-react-sdk": "1.0.7",
"modernizr": "^3.6.0", "modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0-pre3.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^15.6.0", "react": "^15.6.0",
"react-dom": "^15.6.0", "react-dom": "^15.6.0",

6
yarn.lock
View File

@ -6383,9 +6383,9 @@ obuf@^1.0.0, obuf@^1.1.2:
resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
"olm@https://packages.matrix.org/npm/olm/olm-3.1.0-pre3.tgz": "olm@https://packages.matrix.org/npm/olm/olm-3.1.0.tgz":
version "3.1.0-pre3" version "3.1.0"
resolved "https://packages.matrix.org/npm/olm/olm-3.1.0-pre3.tgz#525aa8191b4b6fcb07a3aa6815687780b99be411" resolved "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz#2c8fc2a42b7ea12febc31baa73ec03d9b601da16"
on-finished@~2.3.0: on-finished@~2.3.0:
version "2.3.0" version "2.3.0"