Merge released cherrypicks into staging
#128
Closed
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
## Description of Changes Redo these PRs: - clockworklabs/com.clockworklabs.spacetimedbsdk-archive#56 - clockworklabs/com.clockworklabs.spacetimedbsdk-archive#59 - clockworklabs/com.clockworklabs.spacetimedbsdk-archive#61 I'm not sure how these repos were merged in #117, but it appears that this wasn't carried over. (Either way we need to make this a required check). ## API No ## Requires SpacetimeDB PRs *List any PRs here that are required for this SDK change to work* Co-authored-by: Zeke Foppa <[email protected]>
## Description of Changes #123 reverted the non-code-changes in #119. This cherrypicks them back. See the discussion at 732dd28#r146042766 for more context. Co-authored-by: Jeremie Pelletier <[email protected]>
bfops
changed the title
stagingstaging
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.
Description of Changes
Just ran
git merge origin/masterand resolved conflicts.API
None
Requires SpacetimeDB PRs
None