matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-08-06 16:22:46 +03:00
Code Activity

Merge matrix-react-sdk into element-web

Browse Source 
Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2024-10-15 14:57:26 +01:00
parent b428b4aa9d b084ff2313
commit f0ee7f7905
3265 changed files with 484599 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit-tests/async-components/structures/ErrorView-test.tsx
View File

@@ -7,9 +7,9 @@ Please see LICENSE files in the repository root for full details.
*/
import * as React from "react";
import { render } from "@testing-library/react";
import SdkConfig from "matrix-react-sdk/src/SdkConfig";
import { render } from "jest-matrix-react";
import SdkConfig from "../../../../src/SdkConfig";
import { ErrorView, UnsupportedBrowserView } from "../../../../src/async-components/structures/ErrorView";
import { setupLanguageMock } from "../../../setup/setupLanguage";