Skip to content
Commit 988009a1 authored by Matej Vavrek's avatar Matej Vavrek
Browse files

Merge branch 'Milestone-3' into 'restaurant-maintainer-location-mvc' 

# Conflicts:
#   MVC/MVC.csproj
#   MVC/Program.cs
parents 8b9cf0f3 295d2f11
Pipeline #385824 passed with stages
in 3 minutes and 11 seconds