tree a60ae45c0e3dca7a488ddfad4fb472da5267092a
parent 374dec110cbe5fb47be8c1b4e6c813316df62e11
parent 7500ee9530e720f6a31c5c648ff3efbe3cc5ccf2
author Ina Curdt <Ina.Curdt@pta.de> 1582805704 +0100
committer Ina Curdt <Ina.Curdt@pta.de> 1582805704 +0100

KON-652: merge conflicts resolved

Merge branch 'KON-605-NEW' of ssh://git.eclipse.org:29418/openk-coremodules/org.eclipse.openk-coremodules.contactBaseData.frontend into KON-605-NEW