Val Lorentz b5e21f761b Merge branch 'next' into 'room-v11' ... # Conflicts: # src/service/rooms/timeline/mod.rs # src/utils/error.rs		2024-04-11 17:34:42 +00:00
..
error.rs	Merge branch 'next' into 'room-v11'	2024-04-11 17:34:42 +00:00
mod.rs	Bump ruma	2022-10-10 14:02:04 +02:00