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
..
Settings	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
Skins	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
ColorThemesSettings.cs	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
CommonLinkUtility.cs	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
IFileUploadHandler.cs	core: migrate several interfaces	2021-03-22 19:04:37 +03:00
PasswordSettings.cs	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00
SearchHandlerManager.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
TenantExtra.cs	Analyzers: fix	2022-02-07 17:53:58 +03:00
TenantLogoHelper.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
TenantStatisticsProvider.cs	WebStudio: moved from 08a01422	2021-05-27 20:13:24 +03:00
TransferResourceHelper.cs	IDE0066	2019-08-15 18:13:25 +03:00
UrlShortener.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
UrlSwitcher.cs	fix	2020-08-27 17:01:37 +03:00