Antonio Scandurra cc0bc444b1 Merge remote-tracking branch 'origin/main' into surfaces ... # Conflicts: # crates/ui2/src/components/avatar.rs		2023-11-30 10:48:20 +01:00
..
docs	WIP: Work toward eliminating Component trait	2023-11-18 00:03:23 -07:00
src	Merge remote-tracking branch 'origin/main' into surfaces	2023-11-30 10:48:20 +01:00
Cargo.toml	ui2: Reference theme2 and settings2 crates without the 2 (#3424)	2023-11-28 15:30:29 -05:00