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
Pipeline #884 failed with stage
in 25 seconds