pavelbannov 8563fbc373 Merge branch 'develop' into feature/backend-refactor ... # Conflicts: # common/ASC.Api.Core/Middleware/CommonApiResponse.cs # common/ASC.Api.Core/Middleware/ResponseWrapper.cs # common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs # products/ASC.Files/Core/Configuration/FilesSettings.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Utils/FileUploader.cs # products/ASC.Files/Core/Utils/SocketManager.cs # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs # products/ASC.Files/Server/Startup.cs		2022-02-23 17:37:34 +03:00
..
Builder.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-10 13:16:33 +03:00
FileData.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
FileDataProvider.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-10 13:16:33 +03:00
Launcher.cs	refactoring: add globalusings: files.service	2022-01-30 00:37:07 +03:00
Service.cs	refactoring: remove waste	2022-01-31 18:15:43 +03:00
ThumbnailSettings.cs	refactoring: add globalusings: files.service	2022-01-30 00:37:07 +03:00
Worker.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00