Merge remote-tracking branch 'origin/main' into assistant-2

# Conflicts:
#	crates/ui2/src/components/icon.rs
14def2a1a3Antonio Scandurra committed on 12/6/2023, 5:18:58 PMparents80f31517c9e2f6
41 files changedLine totals unavailable