commit | 9021c7f53b74f879cff94196e186b74b1016ac44 | [log] [tgz] |
---|---|---|
author | Ina Curdt <Ina.Curdt@pta.de> | Tue Jul 14 14:40:03 2020 +0200 |
committer | Ina Curdt <Ina.Curdt@pta.de> | Tue Jul 14 14:40:03 2020 +0200 |
tree | c2e8d99e7ed66f28812d2d994b77121e9cffcb64 | |
parent | ef90531c3137776f01d5f13b590d9ff1a06bdf4d [diff] | |
parent | 5ba3e8d0553b9d06c50e2e9a230a2de7d2acd08d [diff] |
Merge branch 'SI-736-Erfasser-kann-loeschen' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP resolved merge conflicts