Merge remote-tracking branch 'refs/remotes/origin/feat/datacenter'
Conflicts: package.json packages/app/src/components/create-workspace/index.tsx packages/app/src/components/workspace-modal/index.tsx packages/app/src/components/workspace-modal/languageMenu.tsx packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx packages/app/src/components/workspace-slider-bar/index.tsx packages/app/src/pages/_app.tsx pnpm-lock.yaml
This commit is contained in:
@@ -37,8 +37,11 @@
|
||||
"ky-universal": "^0.11.0",
|
||||
"lib0": "^0.2.58",
|
||||
"swr": "^2.0.0",
|
||||
"vitest": "^0.26.3",
|
||||
"y-protocols": "^1.0.5",
|
||||
"yjs": "^13.5.44"
|
||||
"yjs": "^13.5.44",
|
||||
"y-protocols": "^1.0.5"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@blocksuite/blocks": "0.3.1-*",
|
||||
"@blocksuite/store": "0.3.1-*"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user