pavelbannov 0bbc383266 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs		2019-10-30 11:45:55 +03:00
..
Billing	DI: refactoring	2019-10-22 19:08:37 +03:00
Caching	DI: refactoring	2019-10-22 19:08:37 +03:00
Configuration	DI: KafkaCache	2019-10-11 18:03:03 +03:00
Context	DI: refactoring	2019-10-22 19:08:37 +03:00
Contracts	Code Cleanup	2019-08-15 15:04:42 +03:00
Core	DI: removed LogManager	2019-10-22 14:21:44 +03:00
Data	DI: refactoring	2019-10-22 19:08:37 +03:00
Notify	DI: removed LogManager	2019-10-22 14:21:44 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	Merge branch 'master' into refactoring/di	2019-10-30 11:45:55 +03:00
Security	Merge branch 'master' into refactoring/di	2019-10-30 11:45:55 +03:00
Settings	DI: removed LogManager	2019-10-22 14:21:44 +03:00
Tenants	DI: configuration	2019-10-10 13:59:22 +03:00
Tests	DI: refactoring	2019-10-22 19:08:37 +03:00
Users	DI: refactoring	2019-10-22 19:08:37 +03:00
WhiteLabel	DI: configuration	2019-09-23 15:20:08 +03:00
ASC.Core.Common.csproj	Merge branch 'master' into refactoring/di	2019-09-25 18:56:28 +03:00
BaseCommonLinkUtility.cs	DI: log	2019-10-17 18:55:35 +03:00
HostedSolution.cs	DI: dbManager	2019-10-21 15:33:02 +03:00
MultiRegionHostedSolution.cs	DI: dbManager	2019-10-21 15:33:02 +03:00