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
..
AuthenticationController.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
CapabilitiesController.cs	analizators/U2U1115	2022-01-17 11:22:52 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
PortalController.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
SecurityController.cs	analizators/U2U1115	2022-01-17 11:22:52 +03:00
SettingsController.cs	Merge branch 'develop' into feature/async	2022-02-23 16:01:55 +03:00
SmtpSettingsController.cs	analizators/ca1507	2022-01-24 13:49:00 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ThirdPartyController.cs	analizators/U2U1103	2022-01-13 15:53:57 +03:00