• Пасько Виталий's avatar
    Merge remote-tracking branch 'origin/master' · 8fdac13f
    Пасько Виталий authored
    # Conflicts:
    #	PhoneStore/Controllers/OrdersController.cs
    #	PhoneStore/Controllers/PersonalAreaController.cs
    #	PhoneStore/Startup.cs
    #	PhoneStore/Views/PersonalArea/Index.cshtml
    #	PhoneStore/Views/Shared/_Layout.cshtml
    #	PhoneStore/wwwroot/css/site.css
    8fdac13f
PersonalAreaController.cs 562 Bytes