Skip to content

chore: wip debug vercel#4705

Merged
timsuchanek merged 1 commit intomasterfrom
integration/fix-vercel
Dec 17, 2020
Merged

chore: wip debug vercel#4705
timsuchanek merged 1 commit intomasterfrom
integration/fix-vercel

Conversation

@timsuchanek
Copy link
Copy Markdown
Contributor

No description provided.

@timsuchanek timsuchanek added this to the 2.14.0 milestone Dec 17, 2020
@timsuchanek timsuchanek merged commit 0a1b712 into master Dec 17, 2020
@timsuchanek timsuchanek deleted the integration/fix-vercel branch December 17, 2020 15:05
Jolg42 added a commit that referenced this pull request Dec 28, 2020
* master:
  fix(deps): update engines to v2.14.0-26.59cf08bf47e90cb37532900059f3328b4328237c (#4774)
  chore(deps): update definitelytyped
  fix(client): raw transactions (#4759)
  fix(deps): update engines to v2.14.0-22.85cf7930a5fc63cd99fa483153fd33cb35d49cfa
  chore(deps): update studio to v0.332.0
  fix(client): improve error links (#4753)
  fix(deps): update engines to v2.14.0-21.aed47bccd0e3bc61e2a26b14315e2dd839d35a12
  chore: bump engines (#4749)
  fix: fail early for known errors (#4734)
  chore: cleanup (#4707)
  fix(debug): allow multiple instances (#4665)
  chore: wip debug vercel (#4705)
  fix(deps): update engines to v2.14.0-17.af950b3705ef175e85492660c621085eb7f99557
  chore(deps): update dependency rollup-plugin-dts to v2 (#4323)
  feat(client): add more jsdoc to Prisma Client (#4388)
  fix(deps): update engines to v2.14.0-16.c033861e8ed093701af214a25e2bb3e03edacf7c

# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	src/packages/client/package.json
#	src/packages/client/src/runtime/getPrismaClient.ts
#	src/packages/debug/package.json
#	src/packages/engine-core/package.json
#	src/packages/generator-helper/package.json
#	src/packages/get-platform/package.json
#	src/pnpm-lock.yaml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant