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
..
ASC.Api.Core	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
ASC.Common	Dependency injection	2019-09-09 15:56:33 +03:00
ASC.Core.Common	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
ASC.Data.Reassigns	DI: BaseSettings	2019-09-13 14:18:27 +03:00
ASC.Data.Storage	DI: BaseSettings	2019-09-13 14:18:27 +03:00
ASC.FederatedLogin	revert f85711b736	2019-09-12 14:34:58 +03:00
ASC.Feed	Merge branch 'master' into refactoring/di	2019-09-11 21:21:21 +03:00
ASC.IPSecurity	DI: BaseSettings	2019-09-13 14:18:27 +03:00
ASC.MessagingSystem	DI: BaseSettings	2019-09-13 14:18:27 +03:00
ASC.Notify.Textile	suppress warning: NU1701 for release configuration	2019-09-10 18:20:17 +03:00
ASC.Resource.Manager	Merge branch 'master' into refactoring/di	2019-09-11 21:21:21 +03:00
ASC.Textile	added ASC.Textile	2019-08-19 15:35:39 +03:00
ASC.VoipService	Merge branch 'master' into refactoring/di	2019-09-11 21:21:21 +03:00
services	DI: BaseSettings	2019-09-13 14:18:27 +03:00