Skip to content

Commit

Permalink
Merge tag 'v1.10.15' into sc
Browse files Browse the repository at this point in the history
* Fix missing element desktop preferences ([\element-hq#8798](matrix-org/matrix-react-sdk#8798)). Contributed by @t3chguy.
  • Loading branch information
su-ex committed Jun 16, 2022
2 parents 77dad10 + ba38b73 commit 13a22f0
Show file tree
Hide file tree
Showing 10 changed files with 295 additions and 317 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Changes in [1.10.15](https://github.com/vector-im/element-web/releases/tag/v1.10.15) (2022-06-14)
=================================================================================================

## 🐛 Bug Fixes
* Fix missing element desktop preferences ([\#8798](https://github.com/matrix-org/matrix-react-sdk/pull/8798)). Contributed by @t3chguy.

Changes in [1.10.14](https://github.com/vector-im/element-web/releases/tag/v1.10.14) (2022-06-07)
=================================================================================================

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.10.14",
"version": "1.10.15",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
Expand Down Expand Up @@ -59,7 +59,7 @@
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
"matrix-js-sdk": "18.1.0",
"matrix-react-sdk": "3.46.0",
"matrix-react-sdk": "3.47.0",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
"react": "17.0.2",
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"Go to your browser to complete Sign In": "Go to your browser to complete Sign In",
"Unknown device": "Unknown device",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
"Powered by Matrix": "Powered by Matrix",
"Use %(brand)s on mobile": "Use %(brand)s on mobile",
"Unsupported browser": "Unsupported browser",
Expand Down
Loading

0 comments on commit 13a22f0

Please sign in to comment.