Sergey Linnik b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop ... # Conflicts: # common/ASC.Api.Core/Model/EmployeeFullDto.cs # common/ASC.Core.Common/Core/UserInfo.cs # common/ASC.Core.Common/EF/FireBaseUser.cs # common/ASC.Core.Common/Tenants/TenantQuota.cs # common/ASC.IPSecurity/Models/IPRestriction.cs # common/services/ASC.Data.Backup/Api/BackupController.cs # products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs # products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Core/Helpers/DocumentService.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.Files/Server/Api/EditorController.cs # products/ASC.Files/Server/Api/FilesController.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.Files/Server/Api/SecurityController.cs # products/ASC.Files/Server/Api/SettingsController.cs # products/ASC.Files/Server/Api/TagsController.cs # products/ASC.Files/Server/Api/ThirdpartyController.cs # products/ASC.Files/Server/Api/UploadController.cs # products/ASC.Files/Server/Api/VirtualRoomsController.cs # products/ASC.People/Server/Api/ContactsController.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/SecurityController.cs # web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs # web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs # web/ASC.Web.Api/Api/Settings/LdapController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/Settings/NotificationController.cs # web/ASC.Web.Api/Api/Settings/SecurityController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Api/Settings/SsoController.cs # web/ASC.Web.Api/Api/Settings/StorageController.cs # web/ASC.Web.Api/Api/Settings/VersionController.cs # web/ASC.Web.Api/Api/Settings/WebhooksController.cs # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs # web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs # web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs # web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs		2023-08-01 17:07:05 +03:00
..
ACL.cs	added new license headers	2022-03-15 21:00:53 +03:00
Appender.cs	Merge branch 'release/rc-v1.2.0' into feature/cache-fix	2022-12-22 16:17:06 +03:00
StorageSettings.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00