matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-15 11:01:52 +03:00
Code Activity

Merge branch 'develop' into travis/communities/proto/userinfo

Browse Source
This commit is contained in:
Travis Ralston
2020-09-01 10:51:42 -06:00
parent 78d5b87fbc 0d290c9bd2
commit 92c184385c
65 changed files with 350 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/UserMenu.tsx
View File

@ -40,7 +40,7 @@ import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
import { SettingLevel } from "../../settings/SettingLevel";
import IconizedContextMenu, {
IconizedContextMenuOption,
IconizedContextMenuOptionList
IconizedContextMenuOptionList,
} from "../views/context_menus/IconizedContextMenu";
import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
import * as fbEmitter from "fbemitter";