Merge d7e88f6020 into a6da9443da

fix: revert 'and' -> 'as well as'
2026-05-02 07:04:09 +02:00 · 2026-02-09 23:08:46 +00:00 · 2026-02-10 00:08:21 +01:00
1 changed files with 1 additions and 1 deletions
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -1055,7 +1055,7 @@ If a user's client sees that any other user has changed their master
 key, that client must notify the user about the change before allowing
 communication between the users to continue.
-Since device key IDs (`ed25519:DEVICE_ID`) as well as cross-signing key IDs
+Since device key IDs (`ed25519:DEVICE_ID`) and cross-signing key IDs
 (`ed25519:PUBLIC_KEY`) occupy the same namespace, clients must ensure that they
 use the correct keys when verifying.
Author	SHA1	Message	Date
codedust	7a6e695096	Merge `d7e88f6020` into `a6da9443da`	2026-02-09 23:08:46 +00:00
codedust	d7e88f6020	fix: revert 'and' -> 'as well as'	2026-02-10 00:08:21 +01:00