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

Sync develop and master #1651

Merged
merged 7 commits into from
Jul 11, 2024
Merged

Sync develop and master #1651

merged 7 commits into from
Jul 11, 2024

Commits on Nov 30, 2023

  1. Fixed incompatible packages - Update requirements.txt

    @Tim-Hoekstra
    Tim-Hoekstra authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8c1ee62 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Merge pull request nccgroup#1589 from Tim-Hoekstra/master 

    Fixed incompatible packages - Update requirements.txt
    @fernando-gallego
    fernando-gallego authored May 8, 2024
    Configuration menu
    Copy the full SHA
    373fc14 View commit details
    Browse the repository at this point in the history

  2. Revert "Fixed incompatible packages - Update requirements.txt"

    @fernando-gallego
    fernando-gallego authored May 8, 2024
    Configuration menu
    Copy the full SHA
    4ff22f3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request nccgroup#1633 from nccgroup/revert-1589-master 

    Revert "Fixed incompatible packages - Update requirements.txt"
    @fernando-gallego
    fernando-gallego authored May 8, 2024
    Configuration menu
    Copy the full SHA
    7feb470 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge pull request nccgroup#1635 from nccgroup/develop 

    Release 5.14.0
    @fernando-gallego
    fernando-gallego authored May 10, 2024
    Configuration menu
    Copy the full SHA
    7909f2f View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge branch 'master' into develop

    Liyun committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    3ef0dd5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nccgroup:develop' into develop

    @liyun-li
    liyun-li authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    19a7f5b View commit details
    Browse the repository at this point in the history