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

 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
This commit is contained in:
Michael Telatynski 2021-08-11 20:53:22 +01:00
commit 38dbe89316
4 changed files with 12 additions and 6 deletions

View file

@ -283,8 +283,8 @@ const SpaceCreateMenu = ({ onFinished }) => {
{ sub }
</AccessibleButton>,
}) }
&nbsp;
{ _t("To join a space you'll need an invite") }
<br />
{ _t("To join a space you'll need an invite.") }
</p>
<SpaceFeedbackPrompt onClick={onFinished} />