Commit Graph
6 Commits
Author SHA1 Message Date
Mahgs e5959cb435 Merge remote-tracking branch 'origin/master' into keycloak
# Conflicts:
#	build.gradle
#	src/main/java/mops/gruppen2/security/KeycloakConfig.java
#	src/main/resources/application.properties
2020-03-04 16:56:40 +01:00
Mahgs 0b9a151fc9 fixed Account 2020-03-04 16:44:55 +01:00
Mahgs dabe3bedc5 fixed Account 2020-03-04 16:29:01 +01:00
Mahgs 724ed2d85f added keycloak authentification and account 2020-03-04 15:56:27 +01:00
Mahgs 4c1c26e817 added keycloak authentification and account 2020-03-04 15:06:12 +01:00
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