imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge and resolve conflicts

Browse source
This commit is contained in:
Jaiwanth 2021-06-30 12:29:13 +05:30
commit 551639811b
674 changed files with 5275 additions and 5632 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/avatars/MemberAvatar.tsx
View file

@ -91,7 +91,7 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
}
render() {
let {member, fallbackUserId, onClick, viewUserOnClick, ...otherProps} = this.props;
let { member, fallbackUserId, onClick, viewUserOnClick, ...otherProps } = this.props;
const userId = member ? member.userId : fallbackUserId;
otherProps = omit(otherProps, "forExport");