| commit | cbeacac32c30fe6a4652cdb019ceeb6516b2848a | [log] [tgz] |
|---|---|---|
| author | Simon Reis <simon.reis@pta.de> | Tue Feb 18 11:22:07 2020 +0100 |
| committer | Simon Reis <simon.reis@pta.de> | Tue Feb 18 11:22:07 2020 +0100 |
| tree | 0a7fc6511ab4c4ebffb7e6b730196fc2c76e2f75 | |
| parent | 8e05ccaca802a50a651c91bbac711008e6f86739 [diff] | |
| parent | 76cfaf3bb060203433030b653d9bf7fdbffd8e62 [diff] |
Merge branch 'KON-43-Synchronisation-Interne-Personen-mit-LDAP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend into KON-44-Synchronisation-Interne-Personen-mit-Auth&Auth-Modul # Conflicts: # src/main/java/org/eclipse/openk/contactbasedata/config/SchedulerConfig.java # src/main/java/org/eclipse/openk/contactbasedata/service/util/LdapUserAttributesMapper.java