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

Commit 6233df9

Browse files
committed
Merge branch 'master' into develop
2 parents e1e77b2 + bdfac1d commit 6233df9

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Changes in [3.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.1) (2020-10-28)
2+
===================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0...v3.7.1)
4+
5+
* Upgrade JS SDK to 9.0.1
6+
* [Release] Fix theme variable passed to Jitsi
7+
[\#5358](https://github.com/matrix-org/matrix-react-sdk/pull/5358)
8+
* [Release] Widget fixes
9+
[\#5351](https://github.com/matrix-org/matrix-react-sdk/pull/5351)
10+
111
Changes in [3.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0) (2020-10-26)
212
===================================================================================================
313
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0-rc.2...v3.7.0)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.7.0",
3+
"version": "3.7.1",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -78,7 +78,7 @@
7878
"is-ip": "^2.0.0",
7979
"linkifyjs": "^2.1.9",
8080
"lodash": "^4.17.19",
81-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
81+
"matrix-js-sdk": "9.0.1",
8282
"matrix-widget-api": "^0.1.0-beta.5",
8383
"minimist": "^1.2.5",
8484
"pako": "^1.0.11",

yarn.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6505,9 +6505,10 @@ mathml-tag-names@^2.0.1:
65056505
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
65066506
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
65076507

6508-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
6509-
version "9.0.0"
6510-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c416dd01a7edcca11c5224d29916a0f123dec8e6"
6508+
6509+
version "9.0.1"
6510+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d"
6511+
integrity sha512-D2b/pf1/0FTnJoroZhhFCo9WFv+iXELqDgEozo0mBSTbQolIXjHLDQfmhi3p7nDZxxtjWvJjVaiKiVQPjwHCrg==
65116512
dependencies:
65126513
"@babel/runtime" "^7.11.2"
65136514
another-json "^0.2.0"

0 commit comments

Comments
 (0)