Merge master into develop #1345
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
Fix potential soundness bug in rotation
Merge back to master
…-warning-node-12-deprecated-master Bump up actions/checkout to v3
Removal of the outdated FFMul RFC
…i-main [main] Add rust 1.70 in CI
Removed the bot that closed stale issues and stale PRs
…go-doc Use a specific nightly version for building the doc
- implement FromStr trait - test implementation
Fix serialization of preimage key
Track next_instruction_pointer in MIPS VM
Just in case
Add cross-process pipes, ensure that they aren't free'd
Basic support for preimage oracle process within witness environment
Book revamp/moving RCS: rebase to master
|
Converting to draft. I would even be in favor of closing this. We do not want to merge into develop now. We have to make sure first o1js and o1js-bindings are also compatible, including Mina. |
|
Closed in favour of #1379 which does merge in the other direction (the correct one). |
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 branching policy of this repo is quite confusing (is it explicitly specified anywhere?), but
developwas outdated w.r.t.master, while some PRs were merged directly tomaster. This PR updatesdevelop, there were only negligible conflicts, nothing important at all.