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.

Sign up for GitHub

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 changes from 6.4.0.0 into master #342

Merged
merged 4 commits into from
Oct 31, 2024
Merged

Merge changes from 6.4.0.0 into master #342

merged 4 commits into from
Oct 31, 2024

Commits on Oct 30, 2024

  1. Set modifier to ARROWHEAD

    @nathanieliov
    nathanieliov committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    b9504e6 View commit details
    Browse the repository at this point in the history

  2. Set rskj dependency version to 6.4.0-ARROWHEAD

    @nathanieliov
    nathanieliov committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    2b00f53 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #340 from rsksmart/6400-release 

    Prepare 6.4.0.0 release
    @marcos-iov
    marcos-iov authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    f994592 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge branch 'master' into 6400-master-merge 

    # Conflicts:
#	build.gradle
#	gradle/verification-metadata.xml
#	src/main/resources/version.properties
    @nathanieliov
    nathanieliov committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    3d241a3 View commit details
    Browse the repository at this point in the history