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
..
Controllers	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00
Core	Merge branch 'develop' into feature/backend-refactor	2022-02-10 13:16:33 +03:00
Models	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json
ASC.Web.Api.csproj	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
ASC.Web.Api.sln
GlobalUsings.cs	Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor	2022-02-04 23:20:49 +03:00
Program.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-10 13:16:33 +03:00
Startup.cs	Merge branch 'feature/refactoring' into feature/asc-common-refactor	2022-02-03 17:30:13 +03:00