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
..
Attributes	Elastic: removed unused classes	2020-05-08 17:04:05 +03:00
Core	Optimization: removed autofac ILifetimeScope	2021-08-10 17:56:38 +03:00
Engine	Fixed settings issue	2021-10-29 17:21:51 +03:00
protos	ElasticSearch: state	2020-05-06 14:32:26 +03:00
Service	Fixed settings issue	2021-10-29 17:21:51 +03:00
ASC.ElasticSearch.csproj	net6	2021-08-25 18:26:13 +03:00