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

Merge branch 'develop' into sort-imports

Browse source 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist 2021-12-09 08:34:20 +00:00
commit 7b94e13a84
642 changed files with 30052 additions and 8035 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/right_panel/EncryptionPanel.tsx
View file

@ -93,9 +93,9 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
{ _t("One of the following may be compromised:") }
<ul>
<li>{ _t("Your homeserver") }</li>
<li>{ _t("The homeserver the user you’re verifying is connected to") }</li>
<li>{ _t("Yours, or the other users’ internet connection") }</li>
<li>{ _t("Yours, or the other users’ session") }</li>
<li>{ _t("The homeserver the user you're verifying is connected to") }</li>
<li>{ _t("Yours, or the other users' internet connection") }</li>
<li>{ _t("Yours, or the other users' session") }</li>
</ul>
</div>,
onFinished: onClose,