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 |
||
---|---|---|
.. | ||
AdminHelperSettings.cs | ||
AuditResource.az.resx | ||
AuditResource.bg.resx | ||
AuditResource.cs.resx | ||
AuditResource.de.resx | ||
AuditResource.Designer.cs | ||
AuditResource.el-GR.resx | ||
AuditResource.es.resx | ||
AuditResource.fi.resx | ||
AuditResource.fr.resx | ||
AuditResource.hy-AM.resx | ||
AuditResource.it.resx | ||
AuditResource.ja-JP.resx | ||
AuditResource.lv.resx | ||
AuditResource.nl.resx | ||
AuditResource.pl.resx | ||
AuditResource.pt-BR.resx | ||
AuditResource.resx | ||
AuditResource.ru.resx | ||
AuditResource.sk.resx | ||
AuditResource.sl.resx | ||
AuditResource.tr.resx | ||
AuditResource.uk-UA.resx | ||
AuditResource.vi.resx | ||
AuditResource.zh-CN.resx | ||
BuildVersion.cs | ||
DnsSettings.cs | ||
FirstTimeTenantSettings.cs | ||
OpensourceGiftSettings.cs | ||
PaymentAccountHandler.cs | ||
QuotaHelper.cs | ||
SmtpJob.cs | ||
SmtpOperation.cs |