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
..
CookieSettingsModel.cs	Api: added cookiesettings	2022-02-18 18:28:03 +03:00
DnsSettingsModel.cs	Settings: added update dns settings method	2022-02-17 15:55:42 +03:00
PasswordSettingsModel.cs	Settings: update password settings	2022-02-17 18:25:07 +03:00