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

No related branches found

No related tags found

1 merge request!34Changes to API

Pipeline #