pavelbannov 9eba173a44 Merge branch 'develop' into feature/backend-refactor ... # Conflicts: # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Model/CreateFileModel.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.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 # products/ASC.People/Server/Controllers/PeopleController.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2022-04-21 22:36:29 +03:00
..
ASC.Common.Tests	fixed tests	2022-02-10 16:24:55 +03:00
ASC.Core.Common.Tests	fix build	2022-03-01 13:36:34 +03:00
ASC.Notify.Textile.Tests	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
ASC.Web.Api.Tests	fix build	2022-03-01 13:36:34 +03:00
ASC.Webhooks.Tests	fix build	2022-03-01 13:36:34 +03:00
Frontend.Translations.Tests	Merge branch 'feature/virtual-rooms-1.2' into feature/add-units	2022-04-04 19:34:51 +03:00