Skip to content
Commit 16e749e5 authored by Antonín Svitáček's avatar Antonín Svitáček
Browse files

Merge remote-tracking branch 'origin/seed_for_movies_and_personnel' into...

Merge remote-tracking branch 'origin/seed_for_movies_and_personnel' into seed_for_movies_and_personnel

# Conflicts:
#	movie/src/main/resources/application.yml
#	personnel/src/main/resources/application.yml
#	personnel/src/test/java/com/example/pa165_project_movies/personnel/rest/PersonIT.java
#	review/src/main/resources/application.yml
parents 35a692a1 bfb48d49
Loading
Loading
Loading
Pipeline #328744 passed with stages
in 2 minutes and 42 seconds