|
a35d2e05c7
|
Merge branch 'LabWork_8' into LabWork_8_hard
# Conflicts:
# SushiBar/SushiBar/FormMails.cs
# SushiBar/SushiBar/FormMain.Designer.cs
# SushiBar/SushiBar/Program.cs
# SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs
# SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs
# SushiBar/SushiBarDatabaseImplement/Models/Order.cs
# SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
# SushiBar/SushiBarFileImplement/Models/Message.cs
# SushiBar/SushibarListImplement/Models/Message.cs
|
2023-05-05 09:32:57 +04:00 |
|