Merge branch 'master' into remote-desktop
This commit is contained in:
commit
f9df5aa41b
@ -392,7 +392,7 @@ jsonCIContent = \case
|
|||||||
CIRcvChatFeatureRejected feature -> JCIRcvChatFeatureRejected {feature}
|
CIRcvChatFeatureRejected feature -> JCIRcvChatFeatureRejected {feature}
|
||||||
CIRcvGroupFeatureRejected groupFeature -> JCIRcvGroupFeatureRejected {groupFeature}
|
CIRcvGroupFeatureRejected groupFeature -> JCIRcvGroupFeatureRejected {groupFeature}
|
||||||
CISndModerated -> JCISndModerated
|
CISndModerated -> JCISndModerated
|
||||||
CIRcvModerated -> JCISndModerated
|
CIRcvModerated -> JCIRcvModerated
|
||||||
CIInvalidJSON json -> JCIInvalidJSON (toMsgDirection $ msgDirection @d) json
|
CIInvalidJSON json -> JCIInvalidJSON (toMsgDirection $ msgDirection @d) json
|
||||||
|
|
||||||
aciContentJSON :: JSONCIContent -> ACIContent
|
aciContentJSON :: JSONCIContent -> ACIContent
|
||||||
|
Loading…
Reference in New Issue
Block a user