zed 0.67.3

Merge branch 'main' into v0.67.x
zed 0.67.2
2022-12-16 12:03:25 +01:00 · 2022-12-16 12:02:37 +01:00 · 2022-12-15 19:50:29 +01:00 · 2022-12-15 19:49:51 +01:00 · 2022-12-13 15:11:22 +01:00 · 2022-12-13 15:10:37 +01:00
3 changed files with 3 additions and 3 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8130,7 +8130,7 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"

 [[package]]
 name = "zed"
-version = "0.68.0"
+version = "0.67.3"
 dependencies = [
 "activity_indicator",
 "anyhow",
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.68.0"
+version = "0.67.3"

 [lib]
 name = "zed"
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@@ -1 +1 @@
-dev
+preview
Author	SHA1	Message	Date
Antonio Scandurra	277dfccb1d	zed 0.67.3	2022-12-16 12:03:25 +01:00
Antonio Scandurra	f2cc00ee2f	Merge branch 'main' into v0.67.x	2022-12-16 12:02:37 +01:00
Antonio Scandurra	b89582cf98	zed 0.67.2	2022-12-15 19:50:29 +01:00
Antonio Scandurra	5c64fde1ce	Merge branch 'main' into v0.67.x	2022-12-15 19:49:51 +01:00
Antonio Scandurra	f48ef7bbef	zed 0.67.1	2022-12-13 15:11:22 +01:00
Antonio Scandurra	8761fe9e1d	Merge pull request #1965 from zed-industries/preserve-calls-during-server-restarts Automatically re-join call when server is restarted	2022-12-13 15:10:37 +01:00
Mikayla Maki	26a6316e02	Merge pull request #1963 from zed-industries/fix-workspace-corner-cases Fix small workspace deserialization corner cases	2022-12-13 15:10:34 +01:00
Max Brunsfeld	08fd5cc968	Merge pull request #1962 from zed-industries/scrolling-breaks-follow Avoid breaking follow when syncing leader's scroll position	2022-12-13 15:10:27 +01:00
Mikayla Maki	f8647c7c23	Merge pull request #1961 from zed-industries/fix-next-screen-bug Fixed issue where the NextScreen action would never have an effect	2022-12-13 15:10:18 +01:00
Mikayla Maki	b13a60735b	Merge pull request #1959 from zed-industries/serializing-bug-fixes Add check for if the user wants a blanks workspace when deserializing	2022-12-13 15:10:11 +01:00
Antonio Scandurra	4b612882a3	Merge pull request #1950 from zed-industries/reconnect-to-room Automatically re-join call when client connection drops	2022-12-13 15:10:02 +01:00
Mikayla Maki	e108c16333	Merge pull request #1951 from zed-industries/dock-bugfix Fix infinite loop in dock position when deserializing # Conflicts: # crates/workspace/src/workspace.rs	2022-12-13 15:09:40 +01:00
Max Brunsfeld	ec3835b989	v0.67.x preview	2022-12-08 15:32:48 -08:00