Commit f64b2e91 authored by Matej Vavrek's avatar Matej Vavrek
Browse files

Merge branch 'Milestone-2' into 'api-fixes' 

# Conflicts:
#   Api/Controllers/EventController.cs
#   BusinessLayer/Services/RestaurantService/RestaurantService.cs
#   BusinessLayer/Services/UserService/IUserService.cs
#   BusinessLayer/Services/UserService/UserService.cs
parents 587bd7a7 2aff64d6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment