Updating stable cadence branch with latest changes of master #5575
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
…be-blocks [Access] Implement gRPC streaming endpoint SubscribeBlocks
Co-authored-by: Yurii Oleksyshyn <yuraolex@gmail.com>
…f github.com:Guitarheroua/flow-go into guitarheroua/send-and-subscribe-transaction_statuses
…-observer' of https://github.com/AndriiDiachuk/flow-go into AndriiDiachuk/add-standard-access-api-implementation-on-observer
Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com>
|
Tried to figure out the actual adjustments that were made, and came up with this diff of diffs, and it LGTM! (2ee7a14 as the last commit from master AFAICS) diff -u <(git diff 2ee7a14ca7270ea64f59dc46a60ae17d5b1ae602...c58eb78a2585f70fbb8daf053d96e8b0597e74a1) <(git diff 2ee7a14ca7270ea64f59dc46a60ae17d5b1ae602...ramtin/update-stable-cadence-15) |
turbolent
approved these changes
Apr 9, 2024
added 2 commits
April 9, 2024 20:03
… into ramtin/update-stable-cadence-15
zhangchiqing
approved these changes
Apr 9, 2024
janezpodhostnik
approved these changes
Apr 9, 2024
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.
Updating stable cadence feature branch with latest changes on master
conflicts were minimal (mostly mod files)