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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

Browse source 
 Conflicts:
	src/components/views/elements/StyledRadioGroup.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
This commit is contained in:
Michael Telatynski 2021-06-29 12:26:55 +01:00
commit 88cd5aeaf6
232 changed files with 5919 additions and 3404 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/elements/StyledRadioGroup.tsx
View file

@ -62,9 +62,9 @@ function StyledRadioGroup<T extends string>({
disabled={d.disabled ?? disabled}
outlined={outlined}
>
{d.label}
{ d.label }
</StyledRadioButton>
{d.description}
{ d.description ? <span>{ d.description }</span> : null }
</React.Fragment>)}
</React.Fragment>;
}