Antonio Scandurra feeb44c122 Merge remote-tracking branch 'origin/main' into editor2-rename ...

# Conflicts:
#	crates/editor2/src/editor.rs
#	crates/editor2/src/element.rs
#	crates/gpui2/src/style.rs

2023-11-15 09:51:33 +01:00

..

src

Merge remote-tracking branch 'origin/main' into editor2-rename

2023-11-15 09:51:33 +01:00

Cargo.toml

WIP

2023-11-13 15:53:04 -08:00