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

Merge branch 'develop' into 'hotfix-gui_issues_plotter_and_user_definition_viewer'

# Conflicts:
#   CHANGELOG
#   MDANSE/__pkginfo__.py
parents f4780fb9 5d93406d
Pipeline #4077 passed with stages
in 15 minutes and 14 seconds