Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq

This commit is contained in:
maliakal_d 2021-06-28 17:51:07 +02:00
commit 8c1a813214