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

Reset matrix-js-sdk back to develop branch

pull/14080/head
RiotRobot 2020-06-16 12:00:53 +01:00
parent 754d849055
commit 6558d6d828
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -60,7 +60,7 @@
"browser-request": "^0.3.3", "browser-request": "^0.3.3",
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"matrix-js-sdk": "6.2.2", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "2.7.2", "matrix-react-sdk": "2.7.2",
"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",

19
yarn.lock
View File

@ -6980,6 +6980,20 @@ matrix-js-sdk@6.2.2:
request "^2.88.0" request "^2.88.0"
unhomoglyph "^1.0.2" unhomoglyph "^1.0.2"
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "6.2.2"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c194e81637fb07fe6ad67cda33be0d5d4c10115"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.2"
loglevel "^1.6.4"
qs "^6.5.2"
request "^2.88.0"
unhomoglyph "^1.0.2"
matrix-mock-request@^1.2.3: matrix-mock-request@^1.2.3:
version "1.2.3" version "1.2.3"
resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@ -7004,8 +7018,8 @@ matrix-react-sdk@2.7.2:
create-react-class "^15.6.0" create-react-class "^15.6.0"
diff-dom "^4.1.3" diff-dom "^4.1.3"
diff-match-patch "^1.0.4" diff-match-patch "^1.0.4"
emojibase-data "^5.0.1" emojibase-data "^4.0.2"
emojibase-regex "^4.0.1" emojibase-regex "^3.0.0"
escape-html "^1.0.3" escape-html "^1.0.3"
file-saver "^1.3.3" file-saver "^1.3.3"
filesize "3.5.6" filesize "3.5.6"
@ -7032,7 +7046,6 @@ matrix-react-sdk@2.7.2:
react-beautiful-dnd "^4.0.1" react-beautiful-dnd "^4.0.1"
react-dom "^16.9.0" react-dom "^16.9.0"
react-focus-lock "^2.2.1" react-focus-lock "^2.2.1"
react-resizable "^1.10.1"
resize-observer-polyfill "^1.5.0" resize-observer-polyfill "^1.5.0"
sanitize-html "^1.18.4" sanitize-html "^1.18.4"
text-encoding-utf-8 "^1.0.1" text-encoding-utf-8 "^1.0.1"