Merge remote-tracking branch 'origin/feature/upload-company-logo' into feature/upload-company-logo

# Conflicts:
#	pnpm-lock.yaml
#	server/package.json
This commit is contained in:
JonCSykes committed 2026-03-07 13:36:41 -05:00
commit a765d342e0
2 files changed
+3

No files matched your search

+1
View File
@@ -164,6 +164,7 @@ importers:
'@types/node':
specifier: ^24.6.0
version: 24.12.0
typescript:
specifier: ^5.7.3
version: 5.9.3
+2
View File
@@ -34,6 +34,8 @@
"@paperclipai/adapter-claude-local": "workspace:*",
"@paperclipai/adapter-codex-local": "workspace:*",
"@paperclipai/adapter-cursor-local": "workspace:*",
"@paperclipai/adapter-opencode-local": "workspace:*",
"@paperclipai/adapter-pi-local": "workspace:*",
"@paperclipai/adapter-openclaw": "workspace:*",
"@paperclipai/adapter-opencode-local": "workspace:*",