Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop -> main #14744

Closed
wants to merge 632 commits into from
Closed

Merge develop -> main #14744

wants to merge 632 commits into from

Conversation

mitschabaude
Copy link
Contributor

@mitschabaude mitschabaude commented Dec 19, 2023

Sventimir and others added 30 commits October 27, 2023 09:25
…ions-in-discovery-orchestrator

Let discovery step try connections in parallel
…issions

[RFC] Verification key permissions
…t-replace-fee

Fix flakiness insufficient replace fee
Base automatically changed from merge-rampup-main to o1js-main December 20, 2023 13:48
@mergify mergify bot mentioned this pull request Jan 11, 2024
@mitschabaude
Copy link
Contributor Author

this branch is not compatible with the network (o1-labs/o1js#1340), so we'll have to wait.

I'm closing the PR, it will be easy to replicate because I merged the same branch including the conflicts that it resolved to develop, see #14834

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.