Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock
pull/22577/head
RiotRobot 2 months ago
commit b400463ff3
  1. 6
      CHANGELOG.md
  2. 6
      package.json
  3. 7
      yarn.lock

@ -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)
=================================================================================================

@ -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": {
@ -58,8 +58,8 @@
"gfm.css": "^1.1.2",
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "18.1.0",
"matrix-react-sdk": "3.47.0",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
"react": "17.0.2",

@ -8302,9 +8302,10 @@ matrix-mock-request@^2.0.0:
dependencies:
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.46.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5da187d520f836af7808ab5346a379c2262e745a"
matrix-react-sdk@3.47.0:
version "3.47.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.47.0.tgz#d662ac4eafc18b22366a7c46e749aa014c073e05"
integrity sha512-s6v0Z8rYHJJNKmPcu/8SyvzqcODskirYozi9nCsHKOGqa2ziuIZzkJUZhtOMwOO7k8pEUaCL58Hc1tERtNzkOA==
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"

Loading…
Cancel
Save