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

Jump to bottom

Resolving conflict between develop and stable #175

Merged
merged 2 commits into from
Jan 9, 2024
Merged

Resolving conflict between develop and stable #175

merged 2 commits into from
Jan 9, 2024

Commits on Oct 23, 2023

  1. Synchronize stable with develop branch (#152) 

    Synchronize stable with develop branch
    @jeanbez
    jeanbez authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    f2011d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Merge branch 'stable' into develop

    @jeanbez
    jeanbez committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    0a58b8c View commit details
    Browse the repository at this point in the history