pavelbannov 418ca246c8 Merge branch 'feature/backend-refactor' into feature/people-refactor ... # Conflicts: # products/ASC.People/Server/Startup.cs		2022-03-03 14:35:22 +03:00
..
Client	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
Server	Merge branch 'feature/backend-refactor' into feature/people-refactor	2022-03-03 14:35:22 +03:00