PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2023-09-29 11:30:11 +01:00
commit b7cca93ceb
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,3 +1,9 @@
Changes in [1.11.45](https://github.com/vector-im/element-web/releases/tag/v1.11.45) (2023-09-29)
=================================================================================================
## 🐛 Bug Fixes
* Fix Emoji font on Safari 17 ([\#11673](https://github.com/matrix-org/matrix-react-sdk/pull/11673)).
Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26) Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26)
================================================================================================= =================================================================================================

6
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "element-web", "name": "element-web",
"version": "1.11.44", "version": "1.11.45",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
@ -76,8 +76,8 @@
"jsrsasign": "^10.5.25", "jsrsasign": "^10.5.25",
"katex": "^0.16.0", "katex": "^0.16.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-js-sdk": "28.2.0",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-react-sdk": "3.81.1",
"matrix-widget-api": "^1.3.1", "matrix-widget-api": "^1.3.1",
"react": "17.0.2", "react": "17.0.2",
"react-dom": "17.0.2", "react-dom": "17.0.2",

7
yarn.lock
View file

@ -8945,9 +8945,10 @@ matrix-mock-request@^2.5.0:
dependencies: dependencies:
expect "^28.1.0" expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": matrix-react-sdk@3.81.1:
version "3.81.0" version "3.81.1"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/13aed62a91e7151246fc38f6c15a79df116792ba" resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.81.1.tgz#bcdf3e4f88546ebf5000c73c06024c274e887fc4"
integrity sha512-8TCZfqTsEB07reD/tQRehz/epL86Ovj+M476weZj9FFZ91dCK5lRtAeyAwnYYh03lxZ+bJHXMawmSa40CKtlkw==
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.7.0" "@matrix-org/analytics-events" "^0.7.0"