mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-04 02:02:14 +01:00
Code Issues Projects Releases Wiki Activity

Flip SDKs back to develop

Browse Source
This commit is contained in:
J. Ryan Stinnett 2019-11-27 13:33:27 +00:00
parent 08ca66c5e7
commit 31ee75f14f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -73,8 +73,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"matrix-js-sdk": "2.4.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "1.7.4", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"modernizr": "^3.6.0", "modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0", "postcss-easings": "^2.0.0",

13
yarn.lock
View File

@ -6009,10 +6009,9 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
matrix-js-sdk@2.4.5: "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "2.4.5" version "2.4.5"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.5.tgz#0a02f0a3e18c59a393b34b8d6ebc54226cce6465" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ea8003df23d55e2b84911c3204005c42a9ffa9c"
integrity sha512-Mh0fPoiqyXRksFNYS4/2s20xAklmYVIgSms3qFvLhno32LN43NizUoAMBYYGtyjt8BQi+U77lbNL0s5f2V7gPQ==
dependencies: dependencies:
another-json "^0.2.0" another-json "^0.2.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
@ -6033,14 +6032,12 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0" bluebird "^3.5.0"
expect "^1.20.2" expect "^1.20.2"
matrix-react-sdk@1.7.4: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "1.7.4" version "1.7.4"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.4.tgz#06c50b20519ec4de3976b9a6b80eca70d8ef9809" resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/54d6b6aa73656d9c00cc047ace964bc73ce011e7"
integrity sha512-AHiCr0zSDh2cHQF/CiT9ez7F9B+uFQ+XIfTGFbeI22MfY61Vhye8UIVwP7cOMFJ7Ow+wE6470iiscg+boBbRyg==
dependencies: dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0" babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
bluebird "^3.5.0"
blueimp-canvas-to-blob "^3.5.0" blueimp-canvas-to-blob "^3.5.0"
browser-encrypt-attachment "^0.3.0" browser-encrypt-attachment "^0.3.0"
browser-request "^0.3.3" browser-request "^0.3.3"
@ -6069,7 +6066,7 @@ matrix-react-sdk@1.7.4:
linkifyjs "^2.1.6" linkifyjs "^2.1.6"
lodash "^4.17.14" lodash "^4.17.14"
lolex "4.2" lolex "4.2"
matrix-js-sdk "2.4.5" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
optimist "^0.6.1" optimist "^0.6.1"
pako "^1.0.5" pako "^1.0.5"
png-chunks-extract "^1.0.0" png-chunks-extract "^1.0.0"