resolved conflicts from merging 3.1.1 in here

This commit is contained in:
2018-03-21 09:03:31 +01:00
22 changed files with 61 additions and 161 deletions

View File

@ -0,0 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer