Commit Graph
10 Commits
Author SHA1 Message Date
Max Brunsfeld a4b7e3c9f6 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
065d26f5b2 Get RPC2 tests passing
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
2023-10-26 12:47:37 +02:00
Antonio Scandurra 6172cd9015 Merge branch 'zed2-room' into zed2 2023-10-26 11:57:11 +02:00
3bcae6d7de Add call2
Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-10-26 11:56:34 +02:00
Conrad Irwin 693246ba26 Fix fs2 import on zed 2023-10-26 11:41:15 +02:00
Marshall Bowers e67048ee7b Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Antonio Scandurra a72434f67b WIP 2023-10-23 12:16:33 +02:00
Antonio Scandurra 72435af170 Checkpoint 2023-10-22 18:34:45 +02:00
Nathan Sobo 909fbb9538 Checkpoint 2023-10-21 19:07:59 +02:00
Antonio Scandurra b7d30fca2b WIP 2023-10-21 17:52:47 +02:00