OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Change back to develop branch for deps

pull/11031/head
J. Ryan Stinnett 2019-10-01 13:32:36 +01:00
parent be0b4e9072
commit f7a08e8d27
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -74,8 +74,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.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "1.6.1", "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.0.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",

12
yarn.lock
View File

@ -5947,10 +5947,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.1: "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "2.4.1" version "2.4.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.1.tgz#f32f8ebb1f01fa26711a4cf6b78eae125156f455" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e024d047e358cf26caa47542c8f6d9a469a11cb2"
integrity sha512-5mOp396eOtvaMiuUD85TWvuxSP532PuvtH/QLugBGenI15FGwtnC40cTnVYviYWGBi340FPrOKWulc5ILRX6qQ==
dependencies: dependencies:
another-json "^0.2.0" another-json "^0.2.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
@ -5971,10 +5970,9 @@ 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.6.1: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "1.6.1" version "1.6.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.6.1.tgz#37608f7e6ecf5d8a57411c0e2d63e516f897f42c" resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/617a5290f9fbf222f756d79a8b6bcd3d80bfec67"
integrity sha512-+hjM+aGU/Rc39Ebu/SONLX8XJ/Y1Ig7uEOGTV5R+BJMRlLtpK/rYwJk24tpn1LiVMhPU5HJCApnmvpBv3Xo/GQ==
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"
@ -6005,7 +6003,7 @@ matrix-react-sdk@1.6.1:
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.1" 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"