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
..
Builder.cs	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
FileData.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
FileDataProvider.cs	Merge branch 'master' into develop	2021-11-01 13:54:40 +03:00
Launcher.cs	Thumbnail: optimization	2021-08-10 17:54:56 +03:00
Service.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
ThumbnailSettings.cs	Fixed settings issue	2021-10-29 17:21:51 +03:00
Worker.cs	Fixed settings issue	2021-10-29 17:21:51 +03:00