Skip to content
Commit 8d6ffaab authored by Mikulash's avatar Mikulash
Browse files

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
parents d24216b2 d0cffa39
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment