pavelbannov 00849598f0 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Context/SecurityContext.cs # products/ASC.People/Server/Controllers/GroupController.cs # products/ASC.People/Server/Controllers/PeopleController.cs		2019-09-23 19:27:36 +03:00
..
ASC.People	Merge branch 'master' into refactoring/di	2019-09-23 19:27:36 +03:00