Merge remote-tracking branch 'upstream/main' into SimonBrandner/feat/volume-design

This commit is contained in:
Šimon Brandner
2022-08-01 19:23:07 +02:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -31,8 +31,8 @@ interface Props extends HTMLAttributes<HTMLDivElement> {
className: string;
client: MatrixClient;
participants: RoomMember[];
max: number;
size: Size;
max?: number;
size?: Size;
}
export function Facepile({
+1 -1
View File
@@ -8,7 +8,7 @@ import { ProfileModal } from "./profile/ProfileModal";
import { UserMenu } from "./UserMenu";
interface Props {
preventNavigation: boolean;
preventNavigation?: boolean;
}
export function UserMenuContainer({ preventNavigation }: Props) {