Merge branch 'develop' of github.com:vector-im/element-web into export-conversations

This commit is contained in:
Jaiwanth 2021-08-04 11:11:42 +05:30
commit c3995eea5e
10 changed files with 180 additions and 28 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.7.33",
"version": "1.7.34",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -106,7 +106,7 @@
"css-loader": "^3.6.0",
"eslint": "7.18.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"extract-text-webpack-plugin": "^4.0.0-beta.0",