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
..
Billing	revert f85711b736	2019-09-12 14:34:58 +03:00
Caching	People: fix cache	2019-09-03 14:31:51 +03:00
Configuration	IDE0063	2019-08-15 18:08:40 +03:00
Context	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
Contracts	Code Cleanup	2019-08-15 15:04:42 +03:00
Core	Dependency injection	2019-09-09 15:56:33 +03:00
Data	revert f85711b736	2019-09-12 14:34:58 +03:00
Notify	revert f85711b736	2019-09-12 14:34:58 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	DI: BaseSettings	2019-09-13 14:18:27 +03:00
Security	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
Settings	DI: BaseSettings	2019-09-13 14:18:27 +03:00
Tenants	DI: BaseSettings	2019-09-13 14:18:27 +03:00
Tests	revert f85711b736	2019-09-12 14:34:58 +03:00
Users	DI: BaseSettings	2019-09-13 14:18:27 +03:00
WhiteLabel	DI: BaseSettings	2019-09-13 14:18:27 +03:00
ASC.Core.Common.csproj	Dependency injection	2019-09-09 15:56:33 +03:00
BaseCommonLinkUtility.cs	Added ASC.Notify.Textile	2019-08-19 16:51:36 +03:00
HostedSolution.cs	Dependency injection	2019-09-09 15:56:33 +03:00
MultiRegionHostedSolution.cs	IDE0063	2019-08-15 18:08:40 +03:00