# 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 |
||
---|---|---|
.. | ||
Client | ||
Server |