mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
ae638d2643
3 changed files with 18 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
|||
Changes in [1.11.20](https://github.com/vector-im/element-web/releases/tag/v1.11.20) (2023-01-20)
|
||||
=================================================================================================
|
||||
|
||||
## 🐛 Bug Fixes
|
||||
* (Part 2) of prevent crash on older browsers (replace .at() with array.length-1)
|
||||
|
||||
Changes in [1.11.19](https://github.com/vector-im/element-web/releases/tag/v1.11.19) (2023-01-18)
|
||||
=================================================================================================
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "element-web",
|
||||
"version": "1.11.19",
|
||||
"version": "1.11.20",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
11
yarn.lock
11
yarn.lock
|
@ -8187,9 +8187,16 @@ matrix-mock-request@^2.5.0:
|
|||
dependencies:
|
||||
expect "^28.1.0"
|
||||
|
||||
<<<<<<< HEAD
|
||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||
version "3.64.1"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/576d10315996c0b69d21965d06f2d069491f6d5a"
|
||||
=======
|
||||
matrix-react-sdk@3.64.2:
|
||||
version "3.64.2"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.2.tgz#d87ed03f569d4bd5aafca5ae5e27bf2d1532183b"
|
||||
integrity sha512-N5OroTKnbgXtVAWatu1CndAzdWiNr9YXuD7u4dn2sq7hAPIs4XkjRXaFgGNJP3a22GiaxVKlPAhGlpFPBdXKvA==
|
||||
>>>>>>> master
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/analytics-events" "^0.4.0"
|
||||
|
@ -8228,7 +8235,11 @@ matrix-mock-request@^2.5.0:
|
|||
maplibre-gl "^2.0.0"
|
||||
matrix-encrypt-attachment "^1.0.3"
|
||||
matrix-events-sdk "0.0.1"
|
||||
<<<<<<< HEAD
|
||||
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
|
||||
=======
|
||||
matrix-js-sdk "23.1.1"
|
||||
>>>>>>> master
|
||||
matrix-widget-api "^1.1.1"
|
||||
minimist "^1.2.5"
|
||||
opus-recorder "^8.0.3"
|
||||
|
|
Loading…
Reference in a new issue