Sergey Linnik
d2e23e3ed4
# Conflicts: # common/ASC.Core.Common/Tenants/TenantQuota.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.Files/Server/Api/SettingsController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/CapabilitiesController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/SmtpSettingsController.cs # web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs |
||
---|---|---|
.. | ||
Base | ||
ComplexOperations | ||
Log | ||
Novell | ||
Wrapper | ||
ASC.ActiveDirectory.csproj | ||
GlobalUsings.cs | ||
LdapUserManager.cs | ||
LdapUtils.cs |