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
..
Contact.cs	added new license headers	2022-03-15 21:00:53 +03:00
EmployeeDto.cs	fixed warnings	2022-04-14 22:23:57 +03:00
EmployeeFullDto.cs	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
GroupSummaryDto.cs	code cleanup	2022-04-14 22:42:15 +03:00