pavelbannov 710a3f62fa Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Controllers/PeopleController.cs		2019-09-25 18:56:28 +03:00
..
ASC.Notify	Merge branch 'master' into refactoring/di	2019-09-25 18:56:28 +03:00
ASC.Studio.Notify	Merge branch 'master' into refactoring/di	2019-09-25 18:56:28 +03:00