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
..
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Added ASC.Studio.Notify service	2019-08-01 11:47:15 +03:00
ASC.Studio.Notify.csproj	refactoring	2022-01-13 22:17:56 +03:00
GlobalUsings.cs	refactoring: add globalusings: studio.notify	2022-01-30 01:17:12 +03:00
Program.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00
ServiceLauncher.cs	refactoring: add globalusings: studio.notify	2022-01-30 01:17:12 +03:00