| commit | c3c69c4af93f34c3370aa4225218f39c94707a46 | [log] [tgz] |
|---|---|---|
| author | Simon Reis <simon.reis@pta.de> | Wed Apr 01 11:55:01 2020 +0200 |
| committer | Simon Reis <simon.reis@pta.de> | Wed Apr 01 11:55:01 2020 +0200 |
| tree | c52b659b249213ecd7ba17279a85bb4e1b4407bc | |
| parent | 4e2538de8f52c532e51e65b2024343c3c9afae0c [diff] | |
| parent | db3b44f3332ff9fb70c1e3d4f99302e43b2f3212 [diff] |
Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into SI-352_Meldungen_fuer_Qualifizierer # Conflicts: # gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java