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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into dev #78

Merged
merged 6 commits into from
Jun 30, 2023
Merged

Merge main into dev #78

merged 6 commits into from
Jun 30, 2023

Commits on Jun 15, 2023

  1. Merge pull request #77 from JordyHers-org/main

    Merge pull request #76 from JordyHers-org/dev
    JordyHers committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    1e7795b View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Configuration menu
    Copy the full SHA
    588b772 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev' into dev

    # Conflicts:
    #	CHANGELOG.md
    JordyHers committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    10be1d7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    996b4c9 View commit details
    Browse the repository at this point in the history
  4. fix: resolve linting issue

    JordyHers committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    cafa7b5 View commit details
    Browse the repository at this point in the history
  5. fix: resolve typo in ReadMe

    JordyHers committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    c9e1021 View commit details
    Browse the repository at this point in the history