PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Reset matrix-js-sdk back to develop branch

Browse source
This commit is contained in:
RiotRobot 2020-03-04 13:07:45 +00:00
parent d88f9ed2c0
commit 4548831ac5
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package.json
View file

@ -66,7 +66,7 @@
"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": "5.1.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "2.2.1", "matrix-react-sdk": "2.2.1",
"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",
@ -189,10 +189,14 @@
"app": "electron_app" "app": "electron_app"
}, },
"afterSign": "scripts/electron_afterSign.js", "afterSign": "scripts/electron_afterSign.js",
"protocols": [{ "protocols": [
{
"name": "riot", "name": "riot",
"schemes": ["riot"] "schemes": [
}] "riot"
]
}
]
}, },
"jest": { "jest": {
"modulePathIgnorePatterns": [ "modulePathIgnorePatterns": [

4
yarn.lock
View file

@ -7499,7 +7499,7 @@ mathml-tag-names@^2.1.1:
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "5.1.0" version "5.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/da96765020b632deb5b433077827a4f4a64e16e9" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bc53f8fdec7222b6ca44a63cafbc7ae8c4cc396f"
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
another-json "^0.2.0" another-json "^0.2.0"
@ -7550,7 +7550,7 @@ matrix-react-sdk@2.2.1:
is-ip "^2.0.0" is-ip "^2.0.0"
linkifyjs "^2.1.6" linkifyjs "^2.1.6"
lodash "^4.17.14" lodash "^4.17.14"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-js-sdk "5.1.0"
minimist "^1.2.0" minimist "^1.2.0"
pako "^1.0.5" pako "^1.0.5"
png-chunks-extract "^1.0.0" png-chunks-extract "^1.0.0"