Skip to content

Commit d4f75e4

Browse files
committed
Reset matrix-react-sdk back to develop branch
1 parent 4a4df94 commit d4f75e4

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"gfm.css": "^1.1.2",
6969
"highlight.js": "^9.13.1",
7070
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
71-
"matrix-react-sdk": "2.3.0",
71+
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
7272
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
7373
"postcss-easings": "^2.0.0",
7474
"prop-types": "^15.7.2",

yarn.lock

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7450,21 +7450,6 @@ mathml-tag-names@^2.1.1:
74507450
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
74517451
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
74527452

7453-
matrix-js-sdk@5.2.0:
7454-
version "5.2.0"
7455-
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0.tgz#f213fd7671538a57c6d7e0665a2178ab23b950da"
7456-
integrity sha512-IscXYNx+k7wq5fuwsvKlXSI6Z1/nQ7TBI8AkStHJOAR8rz1DRoxICLFJtWzpOUSrgQuSaUYpOm4+6hS6IVlmtA==
7457-
dependencies:
7458-
"@babel/runtime" "^7.8.3"
7459-
another-json "^0.2.0"
7460-
browser-request "^0.3.3"
7461-
bs58 "^4.0.1"
7462-
content-type "^1.0.2"
7463-
loglevel "^1.6.4"
7464-
qs "^6.5.2"
7465-
request "^2.88.0"
7466-
unhomoglyph "^1.0.2"
7467-
74687453
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
74697454
version "5.2.0"
74707455
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/223d37ffce674a23ca73702f04b9ba31cfd84196"
@@ -7487,10 +7472,9 @@ matrix-mock-request@^1.2.3:
74877472
bluebird "^3.5.0"
74887473
expect "^1.20.2"
74897474

7490-
matrix-react-sdk@2.3.0:
7475+
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
74917476
version "2.3.0"
7492-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.3.0.tgz#67c50130e2c62dcd48bae684b1d68eae4ff229f4"
7493-
integrity sha512-K1+y2Q3XcjRu7jN72JKO2bG8yD0MK8i1tYI8/oafvFJP1HlpphUzF58tQ/EAiXs1a4UnsxBV27xvrHOxqzflLQ==
7477+
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/78fd8e4569096043b22210821d20e085802bbcff"
74947478
dependencies:
74957479
"@babel/runtime" "^7.8.3"
74967480
blueimp-canvas-to-blob "^3.5.0"
@@ -7517,7 +7501,7 @@ matrix-react-sdk@2.3.0:
75177501
is-ip "^2.0.0"
75187502
linkifyjs "^2.1.6"
75197503
lodash "^4.17.14"
7520-
matrix-js-sdk "5.2.0"
7504+
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
75217505
minimist "^1.2.0"
75227506
pako "^1.0.5"
75237507
png-chunks-extract "^1.0.0"

0 commit comments

Comments
 (0)