Merge vercel/staging into vercel/prod #234
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chore: add recommendations for vscode and `.env.template` file
…-resolve compressed nft search resolve
stake token config
from in ./trpc/transactions to null
[Feature] Add Video Support
Merge vercel/staging into dev
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The goal of this PR is to build upon #233, which caught the
devbranch up withvercel/staging. With this PR, we are catching upvercel/prodwithvercel/staging. This will ensure that we havedev,main,vercel/staging, andvercel/prodall in sync, thereby allowing a proper workflow for all future Xray contributions to be established