tree 184cea603f25e1940551d362f13fb67931c5e56c
parent b4a249f89259914a2b0a80127d45d54c251340cc
parent c8e2ec9c590ed565565555e77bb2569e6b503e14
author reiss <simon.reis@pta.de> 1537466143 +0200
committer reiss <simon.reis@pta.de> 1537466143 +0200

Merge branch 'DEVELOP_BE' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.plannedGridMeasures.backend into DEVELOP_BE