Antonio Scandurra 3b918bfee8 Merge branch 'main' into rename-element-traits ... # Conflicts: # crates/gpui2/src/elements/uniform_list.rs # crates/ui2/src/components/context_menu.rs # crates/ui2/src/components/list.rs		2023-11-23 12:47:46 +01:00
..
src	Merge branch 'main' into rename-element-traits	2023-11-23 12:47:46 +01:00
Cargo.toml	Get diagnostics view almost building in the zed2 world	2023-11-17 16:32:35 -05:00