Merge and resolve conflicts

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

View file

@ -27,7 +27,7 @@ interface IProps {
forExport: boolean;
}
const RedactedBody = React.forwardRef<any, IProps>(({mxEvent, forExport}, ref) => {
const RedactedBody = React.forwardRef<any, IProps>(({ mxEvent, forExport }, ref) => {
const cli: MatrixClient = useContext(MatrixClientContext);
let text = _t("Message deleted");
const unsigned = mxEvent.getUnsigned();