Skip to content

Commit

Permalink
Add cross-signing labs flag to develop and document
Browse files Browse the repository at this point in the history
Part of #11407
  • Loading branch information
jryans committed Nov 18, 2019
1 parent 515db51 commit 8043aeb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions docs/labs.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,9 @@ An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/224
## New user info panel (`feature_user_info_panel`)

A new implementation of the user & member info panel, designed to share more code between showing community members & room members.

## Cross-signing (`feature_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.
3 changes: 2 additions & 1 deletion riot.im/develop/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"feature_many_integration_managers": "labs",
"feature_mjolnir": "labs",
"feature_user_info_panel": "labs",
"feature_dm_verification": "labs"
"feature_dm_verification": "labs",
"feature_cross_signing": "labs"
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
Expand Down

0 comments on commit 8043aeb

Please sign in to comment.