Merge branch 'main' into ollama-inline-completions

Browse source

# Conflicts:
#	Cargo.lock
#	crates/edit_prediction_button/src/edit_prediction_button.rs
#	crates/editor/src/editor.rs
#	crates/zed/src/zed/edit_prediction_registry.rs

...

This commit is contained in:

Oliver Azevedo Barnes 2025-08-07 16:29:02 +01:00

parent 78b105f2df 0b5592d788

commit bc58f77e09

No known key found for this signature in database

241 changed files with 6730 additions and 5006 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1955

crates/edit_prediction_button/src/edit_prediction_button.rs Normal file

View file

File diff suppressed because it is too large Load diff