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

This commit is contained in:
maliakal_d 2022-03-16 14:50:40 +01:00
commit 7d91a15834