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

Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3

Browse Source
This commit is contained in:
Michael Telatynski
2020-05-23 11:01:36 +01:00
parent d29ba5b597 696f158be0
commit efeb8a8487
6 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yarn.lock
+1 -1
View File
@@ -5765,7 +5765,7 @@ mathml-tag-names@^2.0.1:
"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/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a4a7097c103da42075f2c70e070fd01fa6fb0d48"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"