Merge branch 'e2e_verification_in_dms' of github.com:uhoreg/matrix-doc into e2e_verification_in_dms

pull/977/head
Hubert Chathi 5 years ago
commit 788e98711e

@ -97,7 +97,7 @@ case this proposal should follow suit.
methods may use the device IDs as part of the verification process. methods may use the device IDs as part of the verification process.
Clients should ignore `m.key.verification.start` events that correspond to Clients should ignore `m.key.verification.start` events that correspond to
verification requests that it did not send. verification requests that they did not send.
#### Rejecting a key verification #### Rejecting a key verification

Loading…
Cancel
Save