sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' into travis/room-list/scrolling-resize

Browse Source
This commit is contained in:
Travis Ralston
2020-06-04 09:19:54 -06:00
parent 83df79aab9 3c73930e9a
commit cdf2d70aea
7 changed files with 221 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yarn.lock
+2 -2
View File
@@ -5802,8 +5802,8 @@ mathml-tag-names@^2.0.1:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "6.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a4a7097c103da42075f2c70e070fd01fa6fb0d48"
version "6.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ef1d5e3d765bc4dc133c0637434c2ca9941ff97b"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"