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 master into develop #590

Merged
merged 6 commits into from
Aug 16, 2023
Merged

merge master into develop #590

merged 6 commits into from
Aug 16, 2023

Commits on Aug 16, 2023

  1. magpie release 4.6.10

    pfuehrlich-pik committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e40aae5 View commit details
    Browse the repository at this point in the history
  2. Revert "magpie release 4.6.10"

    This reverts commit e40aae5.
    pfuehrlich-pik committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    340ae1c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9b389d9 View commit details
    Browse the repository at this point in the history
  4. magpie release 4.6.10

    pfuehrlich-pik committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    49c8b3a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #589 from pfuehrlich-pik/master

    magpie release 4.6.10
    pfuehrlich-pik authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    a9c1230 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    03c874a View commit details
    Browse the repository at this point in the history