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
..
Resources	WebStudio: resources	2021-05-27 21:30:15 +03:00
ASC.Notify.Textile.csproj	net6	2021-08-25 18:26:13 +03:00
GlobalUsings.cs	refactoring: add globalusings: notify.textile	2022-01-30 01:00:02 +03:00
JabberStyler.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-10 13:16:33 +03:00
PushStyler.cs	refactoring: add globalusings: notify.textile	2022-01-30 01:00:02 +03:00
TextileStyler.cs	Merge branch 'develop' into feature/backend-refactor	2022-02-23 17:37:34 +03:00