Merge pull request #13904 from vector-im/t3chguy/remove_cross_signing

Remove cross-signing from labs
This commit is contained in:
Michael Telatynski 2020-06-03 13:42:01 +01:00 committed by GitHub
commit d41fee06a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -72,22 +72,6 @@ An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/224
This also includes a new implementation of the user & member info panel, designed to share more code between showing community members & room members. Built on top of this new panel is also a new UX for verification from the member panel.
## Cross-signing
Cross-signing ([MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756))
improves the device verification experience by allowing you to verify a user
instead of verifying each of their devices.
The feature is enabled by default and does not follow a traditional labs flag
at the moment. If something goes wrong, add this to your config to disable it:
```json
{
"settingDefaults": {
"feature_cross_signing": false
}
}
```
The setting will be removed in a future release, enabling it non-optionally for
all users.