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.Web.Api	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
ASC.Web.Campaigns	Merge branch 'develop' into hotfix/campaigns-banner	2022-03-14 15:51:38 +05:00
ASC.Web.Client	Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme	2022-04-21 18:55:41 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
ASC.Web.Editor	Web: Editor: Added icons url.	2022-04-15 17:59:39 +03:00
ASC.Web.HealthChecks.UI	refactoring	2022-04-15 12:08:06 +03:00
ASC.Web.Login	Web: Login: fix style	2022-04-20 12:58:20 +03:00
ASC.Web.Studio	code cleanup	2022-04-14 22:42:15 +03:00