mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-16 18:43:10 -06:00
Pull latest dendrite fork into harmony (#252)
Latest dendrite main has changes for knockable rooms, and the fix for login crash. Pulled into dendrite fork. Rebased dendrite fork from dendrite main. Co-authored-by: Till <2353100+S7evinK@users.noreply.github.com> Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com> Co-authored-by: kegsay <kegan@matrix.org> Co-authored-by: Tak Wai Wong <tak@hntlabs.com> Co-authored-by: texuf <texuf.eth@gmail.com> Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com>
This commit is contained in:
parent
6a5b223584
commit
a6b3e46128
|
|
@ -45,9 +45,6 @@ const (
|
|||
ConstCreateEventContentValueSpace = "m.space"
|
||||
ConstSpaceChildEventType = "m.space.child"
|
||||
ConstSpaceParentEventType = "m.space.parent"
|
||||
ConstJoinRulePublic = "public"
|
||||
ConstJoinRuleKnock = "knock"
|
||||
ConstJoinRuleRestricted = "restricted"
|
||||
)
|
||||
|
||||
type MSC2946ClientResponse struct {
|
||||
|
|
|
|||
Loading…
Reference in a new issue