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
..
Auth	Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor	2022-02-10 13:56:54 +03:00
Convention	ApiCore: single line expressions replaced by expressions with braces	2022-02-07 19:03:16 +03:00
Core	Common: return IEventBust to ICacheNotify	2022-02-14 12:05:05 +03:00
Middleware	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00
Model	Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor	2022-02-10 13:56:54 +03:00
Routing	Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor	2022-02-10 13:56:54 +03:00
ASC.Api.Core.csproj	Packages updated	2022-02-02 19:54:23 +03:00
GlobalUsings.cs	Merge branch 'feature/backend-refactor' into feature/asc-common-refactor	2022-02-11 16:17:55 +03:00