tree 952704dc9883a502121034e7b8b48d2926d8f131
parent bd6deaf0cb70bc91059e7ad3cb96640e6ca7e14d
parent 9de070dd1886d526f636616c82e20fd3b735c059
author Simon Reis <simon.reis@pta.de> 1593777091 +0200
committer Simon Reis <simon.reis@pta.de> 1593777091 +0200

Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into SI-540-Direkter-Email-Link

# Conflicts:
#	gfsBackendService/src/main/resources/application_localdev.yml