Skip to content

Commit 0cc3ebb

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat-billing
# Conflicts: # src/routes/(console)/organization-[organization]/+page.svelte
2 parents e04dfa3 + e007707 commit 0cc3ebb

File tree

21 files changed

+296
-976
lines changed

21 files changed

+296
-976
lines changed

bun.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
"dayjs": "^1.11.13",
3939
"deep-equal": "^2.2.3",
4040
"echarts": "^5.6.0",
41+
"https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@a4067bf": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@a4067bf",
42+
"https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a4067bf": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a4067bf",
4143
"ignore": "^6.0.2",
4244
"nanoid": "^5.1.5",
4345
"nanotar": "^0.1.1",

src/lib/components/archiveProject.svelte

Lines changed: 0 additions & 379 deletions
This file was deleted.

0 commit comments

Comments
 (0)