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

This commit is contained in:
maliakal_d 2020-09-18 18:16:09 +02:00
commit 608b71d5ea