2 commits

Author	SHA1	Message	Date
Brian Meek	b90114cda3	Merge upstream Dendrite 0.11 changes, Dendrite and lib tests passing (#1440) ... Signed-off-by: Brian Meek <brian@hntlabs.com>	2023-02-08 16:58:48 -08:00
Tak Wai Wong	ea0a8804d2	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>	2022-08-13 16:09:49 -07:00