Skip to content
Snippets Groups Projects
Commit 2c63b0e8 authored by jp6g18's avatar jp6g18
Browse files

Merge branch 'master' into 'Omar'

# Conflicts:
#   AmpScan/ampVis.py
#   GUIs/AmpScanGUI.py
parents 5a608740 13398e31
No related branches found
No related tags found
1 merge request!24Omar changes
Pipeline #884 failed