Merge branch 'master' into develop
This commit is contained in:
commit
ccd998d709
4 changed files with 24 additions and 7 deletions
|
@ -7472,9 +7472,10 @@ matrix-mock-request@^1.2.3:
|
|||
bluebird "^3.5.0"
|
||||
expect "^1.20.2"
|
||||
|
||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||
version "2.3.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/78fd8e4569096043b22210821d20e085802bbcff"
|
||||
matrix-react-sdk@2.3.1:
|
||||
version "2.3.1"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.3.1.tgz#76ac6f98dfa89d4ceb7c63b31e10b9779bca12fe"
|
||||
integrity sha512-TIiiEIUa891eTdRFCaj18sAFJULBDgbFOvV4upaED/aNXxnHOLV5JjNuYzsmQMEJ6Fmrz5iM0DbWXaADnuZwpQ==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.8.3"
|
||||
blueimp-canvas-to-blob "^3.5.0"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue