pavelbannov 8ca88e4620 Merge branch 'develop' into feature/net6 ... # Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Common/ASC.Common.csproj # products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj		2021-11-23 16:40:50 +03:00
..
Caching	fix Bug 50254	2021-10-05 22:28:07 +03:00
Collections
Data
DependencyInjection
Geolocation
Logging
Mapping
Module
Notify
Properties
protos
Security
Threading
Utils
Web
ASC.Common.csproj	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
ASC.Common.sln
DIHelper.cs	fix loading products	2021-10-28 16:07:14 +03:00