pavelbannov 3d4e000778 Merge branch 'develop' into feature/async ... # Conflicts: # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Core/Utils/FileConverter.cs # products/ASC.Files/Core/Utils/FileUploader.cs # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs		2022-02-23 16:01:55 +03:00
..
Builder.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
FileData.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
FileDataProvider.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +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	Elastic: fix ping	2022-01-21 11:26:25 +03:00
Worker.cs	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00