mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-25 07:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
zed/crates/zed
History
Antonio Scandurra 7e411ae098 Merge branch 'main' into screen-sharing 
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
..
src Restored chat_panel, just in case 2022-10-19 11:42:29 -07:00
app-icon.png
app-icon@2x.png
build.rs Merge branch 'main' into screen-sharing 2022-10-21 14:29:45 +02:00
Cargo.toml Merge branch 'main' into screen-sharing 2022-10-21 14:29:45 +02:00