Skip to content
Commit bb470685 authored by Daniel Puchala's avatar Daniel Puchala
Browse files

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

# Conflicts:
#	rest/src/main/java/cz/fi/muni/pa165/movierecommender/rest/api/LoginController.java
parents 9ce55c4d e36c63d9
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