Google Git
Sign in
eclipse/openk-coremodules/org.eclipse.openk-coremodules.contactBaseData.backend/2e28570778565cbbe8ca510921ba7634f5c2963b
commit
2e28570778565cbbe8ca510921ba7634f5c2963b
[log]
author
Simon Reis <simon.reis@pta.de>
Tue Feb 18 16:09:40 2020 +0100
committer
Simon Reis <simon.reis@pta.de>
Tue Feb 18 16:09:40 2020 +0100
tree
886d3e2a8ef05d11f5df34912b35c71071958b24
parent
cbeacac32c30fe6a4652cdb019ceeb6516b2848a [diff]
parent
eb4ff4dc6a8e15fe469747c1d5df7d6797042db4 [diff]
Merge branch 'KON-599_disable_ldap' into DEVELOP

# Conflicts:
#	src/main/java/org/eclipse/openk/contactbasedata/service/LdapService.java
#	src/main/resources/application.yml
tree: 886d3e2a8ef05d11f5df34912b35c71071958b24
  1. src/
  2. .gitignore
  3. Dockerfile
  4. Dockerfile_DevServer
  5. Dockerfile_DevServerUnsecure
  6. mvnw
  7. mvnw.cmd
  8. pom.xml
  9. sonar-project.properties