Skip to content
Snippets Groups Projects
Commit 2dff8812 authored by Maeva Pourpoint's avatar Maeva Pourpoint
Browse files

Merge branch 'master' into 'pyside6' 

# Conflicts:
#   .gitlab-ci.yml
#   conda.recipe/meta.yaml
#   fixhdr/__init__.py
#   fixhdr/fixhdr.py
#   setup.py
parents 8176f1ec 2c59f049
No related branches found
No related tags found
1 merge request!17Convert gui from tkinter to PySide2
Pipeline #3129 passed with stage
Stage: test
    in 1 minute and 47 seconds