Skip to content

merge main into devnet-ready 7-12-2024#629

Merged
sam0x17 merged 181 commits intodevnet-readyfrom
merge-main-into-devnet-ready-7-12-2024
Jul 15, 2024
Merged

merge main into devnet-ready 7-12-2024#629
sam0x17 merged 181 commits intodevnet-readyfrom
merge-main-into-devnet-ready-7-12-2024

Conversation

@sam0x17
Copy link
Contributor

@sam0x17 sam0x17 commented Jul 12, 2024

sets up for the next batch of PRs

generated via:

git merge -X theirs origin/main

100% clean / no merge conflicts 🎉

keithtensor and others added 30 commits June 18, 2024 23:40
add CI check for companion labels, update deployment docs
remove --execution and --wasm-execution
@sam0x17 sam0x17 self-assigned this Jul 12, 2024
@sam0x17 sam0x17 changed the base branch from main to devnet-ready July 12, 2024 16:08
@sam0x17 sam0x17 force-pushed the merge-main-into-devnet-ready-7-12-2024 branch from 6680f1b to bba97c8 Compare July 12, 2024 16:23
@sam0x17 sam0x17 requested a review from a team July 15, 2024 15:01
@sam0x17 sam0x17 merged commit 98a1ed2 into devnet-ready Jul 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants