Commit e24cacb5 authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'develop' into 'hotfix-get_type_of_opened_data_file_macos'

# Conflicts:
#   CHANGELOG
#   MDANSE/__pkginfo__.py
parents 7a4102ec 217cd333
Pipeline #4031 canceled with stages
in 7 seconds