Merge branch 'refs/heads/main' into m3-movie-management
# Conflicts: # keycloak/keycloak_data/h2/keycloakdb.lock.db # keycloak/keycloak_data/h2/keycloakdb.mv.db # keycloak/myrealm-export.json # microservices-monorepo/movies-management/src/main/java/cz/muni/fi/pa165/moviesmanagement/config/SecurityConfiguration.java # microservices-monorepo/movies-management/src/test/java/cz/muni/fi/pa165/moviesmanagement/rest/MovieControllerIT.java # microservices-monorepo/movies-management/src/test/java/cz/muni/fi/pa165/moviesmanagement/rest/MovieControllerWebMvcIT.java
Loading
Please register or sign in to comment