zed/assets
Antonio Scandurra 367bd32789 Merge branch 'main' into assistant2
# Conflicts:
#	crates/editor/src/element.rs
2024-04-15 15:13:57 +02:00
..
contexts Fix annoying system prompt 2023-05-29 21:47:59 -06:00
fonts Remove unused font 2024-01-24 13:14:47 +01:00
icons Make BufferSearch less wide (#10459) 2024-04-11 23:07:29 -06:00
keymaps Merge branch 'main' into assistant2 2024-04-14 09:15:14 -06:00
settings Add a setting to control the vertical and horizontal scroll sensitivity (#10244) 2024-04-15 14:40:09 +02:00
sounds Update collaboration sounds, add sounds to screensharing 2023-07-04 16:18:42 -04:00
themes Use ignored color from theme for items ignored by Git (#10038) 2024-04-01 11:34:49 -04:00