Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into sc

Browse Source
This commit is contained in:
su-ex 2021-02-04 22:22:41 +01:00
commit 20846ab1dc
No known key found for this signature in database
GPG Key ID: D743C50C8B61984C
3 changed files with 12 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.7.20](https://github.com/vector-im/element-web/releases/tag/v1.7.20) (2021-02-04)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19...v1.7.20)
* Upgrade to React SDK 3.13.1
Changes in [1.7.19](https://github.com/vector-im/element-web/releases/tag/v1.7.19) (2021-02-03)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19-rc.1...v1.7.19)

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "schildichat-web",
"version": "1.7.19-sc1",
"version": "1.7.20-sc1",
"description": "A Matrix Client based on Element with a more traditional instant messaging experience",
"author": "SchildiChat",
"repository": {
@ -59,7 +59,7 @@
"jsrsasign": "^10.1.5",
"katex": "^0.12.0",
"matrix-js-sdk": "9.6.0",
"matrix-react-sdk": "3.13.0",
"matrix-react-sdk": "3.13.1",
"matrix-widget-api": "^0.1.0-beta.13",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"prop-types": "^15.7.2",

8
yarn.lock
View File

@ -7534,10 +7534,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@3.13.0:
version "3.13.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.0.tgz#6c34adc190338434849f946480e323d6d0c6f02d"
integrity sha512-G+9uLf07qIrpkLgtdhHkKhbNRvg6lX2xzXNwoi0pIn5L4MZmCrEmuixyCF0BVd8o8sYN2QMPeVTVSvLAl3BQHg==
matrix-react-sdk@3.13.1:
version "3.13.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.1.tgz#40256dda0d9b0e091ce01d1e48565f6aa93ad35d"
integrity sha512-VFcZSAO6P+afjKKJylgsp9PwjBf36xjaWN3l+8WaGqyZDKyJdYOjoU4UZE3O9s/W9YTIcb5UUYyq1y0sunJjog==
dependencies:
"@babel/runtime" "^7.12.5"
await-lock "^2.1.0"