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

Merge branch 'refs/heads/main' into Showcase

# Conflicts:
#	.gitlab-ci.yml
#	microservices-monorepo/movies-management/src/main/java/cz/muni/fi/pa165/moviesmanagement/config/SecurityConfiguration.java
#	microservices-monorepo/movies-management/src/main/resources/application.yml
#	microservices-monorepo/ratings-and-reviews/src/main/resources/application.yml
#	microservices-monorepo/recommendations/src/main/resources/application.yml
#	microservices-monorepo/recommendations/src/test/java/cz/muni/fi/pa165/recommendations/rest/RecommendationsRestControllerWebMvcIT.java
#	microservices-monorepo/stress_tests/locustfile.py
parents 83d22d4a 417dfc5b
Loading
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