tree dfcd9495c080582b66dce9d8756d0e55564434e4
parent 6718def165d6adefa10c770d259e16de3340390d
parent 89f3ab86d0a6065f1b7c5c42d0f98e07be6e0bf2
author Matthias Koller <m.koller@peak-solution.de> 1572260042 +0100
committer Matthias Koller <m.koller@peak-solution.de> 1572260042 +0100

Merge branch 'dev' into mkoller/measurementvalues

Change-Id: Iddcf63299f20505427123a08c1ac50eac2de41a8