Skip to content
Commit f4799e03 authored by Aris Mamo's avatar Aris Mamo
Browse files

Merge branch 'geco-keycloak-integration' of...

Merge branch 'geco-keycloak-integration' of https://crossserv.bologna.enea.it/gitlab/open/opencruise into geco-keycloak-integration

# Conflicts:
#	.env
#	lec/Dockerfile
#	lec/package.json
#	lecservice/Dockerfile
parents bb18c483 60a3f0e6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment