pavelbannov
c89b8ca427
# Conflicts: # common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs # common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs # common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs # common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs # common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs |
||
---|---|---|
.. | ||
AdditionalWhiteLabelSettingsDto.cs | ||
AuditEventDto.cs | ||
AuthenticationTokenDto.cs | ||
CapabilitiesDto.cs | ||
CompanyWhiteLabelSettingsDto.cs | ||
CurrenciesDto.cs | ||
CustomColorThemesSettingsDto.cs | ||
FeedDto.cs | ||
FirebaseDto.cs | ||
LdapCronSettingsDto.cs | ||
LdapSettingsDto.cs | ||
LdapStatusDto.cs | ||
LoginEventDto.cs | ||
LoginSettingsDto.cs | ||
PluginsDto.cs | ||
QuotaDto.cs | ||
QuotaUsageDto.cs | ||
SecurityDto.cs | ||
SettingsDto.cs | ||
SmtpSettingsDto.cs | ||
StorageDto.cs | ||
TenantDto.cs | ||
TenantVersionDto.cs | ||
UsageSpaceStatItemDto.cs | ||
WebhooksConfigDto.cs | ||
WebhooksLogDto.cs | ||
WhiteLabelDto.cs |