Commit Graph
1 Commits
Author SHA1 Message Date
Mahgs 4d29d93fd5 Merge remote-tracking branch 'origin/master' into keycloak
# Conflicts:
#	build.gradle
#	src/main/resources/application.properties
2020-03-04 14:00:56 +01:00