Merge branch 'release-v1.5.16' into release-v1.6.0

This commit is contained in:
RiotRobot 2020-04-15 19:08:28 +01:00
commit 08ef4ff3b1
4 changed files with 35 additions and 5 deletions

View file

@ -7660,7 +7660,7 @@ matrix-mock-request@^1.2.3:
is-ip "^2.0.0"
linkifyjs "^2.1.6"
lodash "^4.17.14"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "5.3.0-rc.1"
minimist "^1.2.0"
pako "^1.0.5"
png-chunks-extract "^1.0.0"