| commit | ba9ff4966222fec5837094a3d08544e05fa2c247 | [log] [tgz] |
|---|---|---|
| author | Ina Curdt <Ina.Curdt@pta.de> | Wed Jan 08 14:19:03 2020 +0100 |
| committer | Ina Curdt <Ina.Curdt@pta.de> | Wed Jan 08 14:19:03 2020 +0100 |
| tree | dface96b54917d6f2abb032a67adb44892e67d29 | |
| parent | 41499f0d37d428566c57207295a9f2d740e8333e [diff] | |
| parent | 485a51ea43b8ea7bb141c174eb57aded061fcf43 [diff] |
Merge branch 'KON_17-Maske-Adressenuebersicht-zu-Kontakt' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend into DEVELOP conflicts resolved Signed-off-by: Ina Curdt <Ina.Curdt@pta.de>