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 main into dev #234

Merged
merged 7 commits into from
Oct 17, 2024
Merged

Merge main into dev #234

merged 7 commits into from
Oct 17, 2024

Conversation

jeremy-babylonlabs
Copy link
Contributor

@jeremy-babylonlabs jeremy-babylonlabs commented Oct 17, 2024

this PR is necessary to sync the commits between dev and main

jeremy-babylonlabs and others added 5 commits October 4, 2024 10:36
* fix: improvement on using the correct height for unbonding model
---------

Co-authored-by: wjrjerome <[email protected]>
* fix: skip ordinals for cactus

---------

Co-authored-by: Filippos Malandrakis <[email protected]>
@jrwbabylonlab
Copy link
Collaborator

fyi, i will merge the PR using merge commit rather than squash

@jrwbabylonlab jrwbabylonlab self-requested a review October 17, 2024 06:53
@jrwbabylonlab
Copy link
Collaborator

the commits should not be a single commit, it shall come from main branch

@jrwbabylonlab jrwbabylonlab merged commit bd1f652 into dev Oct 17, 2024
1 check passed
@jrwbabylonlab jrwbabylonlab deleted the merge-main-into-dev branch October 17, 2024 08:03
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.

3 participants