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

v3 into main #390

Merged
merged 10 commits into from
Dec 25, 2024
Merged

v3 into main #390

merged 10 commits into from
Dec 25, 2024

Conversation

4meta5
Copy link
Contributor

@4meta5 4meta5 commented Dec 20, 2024

Closes #386

KitHat and others added 5 commits November 6, 2024 12:36
Integrated Tanssi runtimes and updated the abstraction macro invocation
* init evm template changes

* works in evm-template

* works in generic-template

* point to latest release
@4meta5 4meta5 self-assigned this Dec 20, 2024
@4meta5 4meta5 requested review from ggonzalez94 and KitHat December 20, 2024 18:40
@4meta5 4meta5 mentioned this pull request Dec 20, 2024
1 task
@4meta5 4meta5 changed the base branch from v3 to main December 20, 2024 18:45
@4meta5 4meta5 changed the title v3 resolve merge conflicts with main merge v3 into main Dec 20, 2024
@4meta5 4meta5 changed the title merge v3 into main v3 into main Dec 20, 2024
@4meta5 4meta5 added the priority: 3 We will resolve this first before everything else. label Dec 20, 2024

This comment was marked as off-topic.

docs/antora.yml Outdated Show resolved Hide resolved
@4meta5 4meta5 merged commit 9158633 into main Dec 25, 2024
7 of 8 checks passed
@4meta5 4meta5 deleted the amar-resolve-v3-merge-conflicts-with-main branch December 25, 2024 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: 3 We will resolve this first before everything else.
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

🏗️ [Core Feature]: Port v3 changes back into main
2 participants