merge heads

master
Claudio Luck 4 years ago
commit f040df2955

@ -1389,6 +1389,60 @@ are inverted between Offerer and Requester.
{::include ../shared/fence-line.mkd}
### Actions
\[\[ TODO \]\]
#### disable
#### hideHandshakeDialog
#### newChallengeAndNegotiationBase
#### openNegotiation
#### openNegotiation
#### ownKeysAreDefaultKeys
#### prepareOwnKeys
#### receivedKeysAreDefaultKeys
#### saveGroupKeys
#### showBeingInGroup
#### showBeingSole
#### showDeviceAdded
#### showGroupCreated
#### showGroupedHandshake
#### showJoinGroupHandshake
#### showSoleHandshake
#### storeNegotiation
#### storeNegotiation
#### tellWeAreGrouped
#### tellWeAreNotGrouped
#### trustThisKey
#### untrustThisKey
#### useOwnChallenge
#### useOwnChallenge
<!--
### Transitions

Loading…
Cancel
Save