oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into assistant-2

Browse Source 
# Conflicts:
#	crates/ui2/src/components/icon.rs
This commit is contained in:
Antonio Scandurra
2023-12-06 18:18:58 +01:00
parent 80f315106d 7c9e2f6b7d
commit 14def2a1a3
41 changed files with 1667 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+2 -1
View File
@@ -2159,6 +2159,7 @@ dependencies = [
"settings2",
"smol",
"theme2",
"ui2",
"util",
]
@@ -11746,7 +11747,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.116.0"
version = "0.117.0"
dependencies = [
"activity_indicator",
"ai",