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
..
ASC.Web.Api	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00
ASC.Web.Campaigns	Web: Campaigns: add ads examples	2022-02-16 14:11:49 +03:00
ASC.Web.Client	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00
ASC.Web.Editor	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
ASC.Web.HealthChecks.UI	refactoring: reorganizing	2022-02-11 18:10:40 +03:00
ASC.Web.Login	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
ASC.Web.Studio	refactoring: reorganizing	2022-02-11 18:05:40 +03:00