Sign up
gitcafe
/
zed
Code
Issues
Pulls
CI
Stacks
Search
Branches
Tags
Code
Issues
Pulls
CI
Stacks
Search
Branches
Tags
More
View stargazers
0
Sign up
Code
Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor
# Conflicts: # crates/editor2/src/items.rs
1abc876c15
Antonio Scandurra committed on 12/1/2023, 11:40:48 AM
parents
8e4f2fb
c9be637
Files Changed
64 files changed
Line totals unavailable
Ignore whitespace
Unified
Split
assets/keymaps
assets/keymaps
…
default.json
default.json
…
crates
crates
…
assistant/src
assistant/src
…
assistant_panel.rs
assistant_panel.rs
…
collab/src/tests
collab/src/tests
…
integration_tests.rs
integration_tests.rs
…
collab2/src/tests
collab2/src/tests
…
integration_tests.rs
integration_tests.rs
…
collab_ui2/src
collab_ui2/src
…
collab_panel.rs
collab_panel.rs
…
collab_titlebar_item.rs
collab_titlebar_item.rs
…
command_palette2/src
command_palette2/src
…
command_palette.rs
command_palette.rs
…
diagnostics/src
diagnostics/src
…
diagnostics.rs
diagnostics.rs
…
items.rs
items.rs
…
diagnostics2/src
diagnostics2/src
…
diagnostics.rs
diagnostics.rs
…
items.rs
items.rs
…