Skip to content
Commit c5d36c68 authored by Alžbeta Strakošová's avatar Alžbeta Strakošová
Browse files

Merge branch 'milestone3-rest-location' into 'milestone3' 

Added Location rest controller, fixed annotations in Location and Spot...

See merge request !29
parents 544e9c7c 793ce630
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