Skip to content
Commit e47294b9 authored by Petr Šlézar's avatar Petr Šlézar
Browse files

Merge remote-tracking branch 'origin/devel' into milestone-2-petr 

# Conflicts:
#	services/src/test/java/cz/fi/muni/pa165/movierecommender/service/ReviewServiceTest.java
parents 12d42c70 5f5dcd0e
Hide whitespace changes
Inline Side-by-side
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