Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag

This commit is contained in:
David Baker 2020-03-26 09:40:09 +00:00
commit a9e7bf9899
10 changed files with 123 additions and 13 deletions

View file

@ -583,6 +583,10 @@
"not found": "not found",
"Cross-signing private keys:": "Cross-signing private keys:",
"in secret storage": "in secret storage",
"Self signing private key:": "Self signing private key:",
"cached locally": "cached locally",
"not found locally": "not found locally",
"User signing private key:": "User signing private key:",
"Secret storage public key:": "Secret storage public key:",
"in account data": "in account data",
"Homeserver feature support:": "Homeserver feature support:",