Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Reset matrix-js-sdk back to develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
RiotRobot committed Oct 24, 2023
1 parent 7f2b671 commit 6e24b4d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"maplibre-gl": "^2.0.0",
"matrix-encrypt-attachment": "^1.0.3",
"matrix-events-sdk": "0.0.1",
"matrix-js-sdk": "29.1.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-widget-api": "^1.5.0",
"memoize-one": "^6.0.0",
"minimist": "^1.2.5",
Expand Down
16 changes: 7 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1813,10 +1813,10 @@
emojibase "^15.0.0"
emojibase-data "^15.0.0"

"@matrix-org/matrix-sdk-crypto-wasm@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.0.0.tgz#a4e9682705f090c94a58f6b851054f7598de9e83"
integrity sha512-8tKmI9u35URvtAr6zcfNGphImWt1y458iKq2PSPOSARlsmVk2lkrhsBFihBnWJY1oJC2EMsyfI8XTRuVYv00TQ==
"@matrix-org/matrix-sdk-crypto-wasm@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2"
integrity sha512-PNFdLr68uLNT81iFmJL0PH98t7/U4g+a51d5+BmbKo0LEqchLkEKNraD1vq/kzPK6X7p/3IapQI5P+5Lr8jHsg==

"@matrix-org/matrix-wysiwyg@2.4.1":
version "2.4.1"
Expand All @@ -1825,7 +1825,6 @@

"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
version "3.2.14"
uid acd96c00a881d0f462e1f97a56c73742c8dbc984
resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz#acd96c00a881d0f462e1f97a56c73742c8dbc984"

"@matrix-org/react-sdk-module-api@^2.1.1":
Expand Down Expand Up @@ -7691,13 +7690,12 @@ matrix-events-sdk@0.0.1:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==

matrix-js-sdk@29.1.0:
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "29.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0.tgz#4d1dd66575e77030a6446f033e86dd203d08b7b5"
integrity sha512-nF+ACFioDltGCf2KFfXK7QoJ70Ytnzm4Jse2UI+BDXeR9WCjtKefXJtboN2rmU4MFmLCTHcnBTmu6yig67YUqw==
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d750e33ec955a9305a29426e5a64f05e66b14310"
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^2.0.0"
"@matrix-org/matrix-sdk-crypto-wasm" "^2.1.1"
another-json "^0.2.0"
bs58 "^5.0.0"
content-type "^1.0.4"
Expand Down

0 comments on commit 6e24b4d

Please sign in to comment.