Merge branch 'guild' into feat/guild-more-menu · git-goods/git-animal-client@7519fc0 · GitHub

Commit

Merge branch 'guild' into feat/guild-more-menu

Browse files

# Conflicts:
#	apps/web/src/app/[locale]/error.tsx
#	apps/web/src/app/[locale]/guild/[id]/MoreMenu.tsx
#	apps/web/src/app/[locale]/guild/_components/GuidlInfoFormClient.tsx
#	apps/web/src/app/[locale]/guild/_components/GuildCreateForm.tsx
#	apps/web/src/app/[locale]/guild/page.tsx
#	packages/api/src/guild/index.ts

Loading branch information

sumi-0011 committed Jan 11, 2025

2 parents 93ef9f2 + 0f58727 commit 7519fc0