pavelbannov
a085e8ef38
# Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Utility/TenantExtra.cs |
||
---|---|---|
.. | ||
AmazonS3Settings.cs | ||
AmiPublicDnsSyncService.cs | ||
ConnectionStringNameTypeConverter.cs | ||
Constants.cs | ||
Consumer.cs | ||
SmtpSettings.cs |