tree 57010d65e12e5f39937e18aa4d5c042931bbe76c
parent be95f17220ced107fffa3baf5608b032b67cd9fc
parent 7e02856e6b7f07d03a9a4516da2696aa27fd23c2
author vogtj <simon.reis@pta.de> 1536916933 +0200
committer vogtj <simon.reis@pta.de> 1536916933 +0200

Merge branch 'DEVELOP_FE' of ssh://172.18.22.160:29418/oK/PlannedGridMeasures/Frontend into DEVELOP_FE