Merge branch 'hierarchy' into 'next'

feat: space hierarchies

See merge request famedly/conduit!495
This commit is contained in:
Timo Kösters 2023-07-03 13:56:47 +00:00
commit 833c1505f1
13 changed files with 556 additions and 48 deletions

View file

@ -2,7 +2,8 @@
rust_2018_idioms,
unused_qualifications,
clippy::cloned_instead_of_copied,
clippy::str_to_string
clippy::str_to_string,
clippy::future_not_send
)]
#![allow(clippy::suspicious_else_formatting)]
#![deny(clippy::dbg_macro)]
@ -385,6 +386,7 @@ fn routes() -> Router {
.ruma_route(client_server::get_relating_events_with_rel_type_and_event_type_route)
.ruma_route(client_server::get_relating_events_with_rel_type_route)
.ruma_route(client_server::get_relating_events_route)
.ruma_route(client_server::get_hierarchy_route)
.ruma_route(server_server::get_server_version_route)
.route(
"/_matrix/key/v2/server",