Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into screen-sharing

Browse source 
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
This commit is contained in:
Antonio Scandurra 2022-10-21 14:29:45 +02:00
commit 7e411ae098
75 changed files with 2438 additions and 1903 deletions
Download patch file Download diff file Expand all files Collapse all files

2
script/zed-with-local-servers
View file

@ -1 +1 @@
ZED_SERVER_URL=http://localhost:3000 cargo run $@
ZED_ADMIN_API_TOKEN=secret ZED_SERVER_URL=http://localhost:3000 cargo run $@