Skip to content
Commit 8eb61838 authored by Adam Marhefka's avatar Adam Marhefka
Browse files

Merge branch 'main' into 'M2-movie'

# Conflicts:
#   movie/src/main/java/cz/muni/fi/movie_recommender_catalogue/movie/data/model/MovieCrew.java
parents f6ef5431 714f4c38
Pipeline #319655 passed with stages
in 1 minute and 59 seconds
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment