pavelbannov de16476542 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Core.Common/Context/SecurityContext.cs # products/ASC.People/Server/Controllers/PeopleController.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs		2019-09-16 15:35:44 +03:00
..
Impl	revert f85711b736	2019-09-12 14:34:58 +03:00
CoreContext.cs	Dependency injection	2019-09-09 15:56:33 +03:00
SecurityContext.cs	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
WorkContext.cs	Dependency injection	2019-09-09 15:56:33 +03:00