pavelbannov
e5229f12f5
# Conflicts: # common/ASC.Api.Core/Middleware/TenantStatusFilter.cs # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Data.Backup.Core/BackupAjaxHandler.cs # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs # common/ASC.Data.Storage/Configuration/StorageSettings.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # products/ASC.Files/Core/Core/ResponseStream.cs # products/ASC.Files/Core/Helpers/Global.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Service/Thumbnail/Builder.cs # products/ASC.Files/Service/Thumbnail/Worker.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs |
||
---|---|---|
.. | ||
Import | ||
CustomNamingPeople.cs | ||
UserHelpTourSettings.cs | ||
UserInfoComparer.cs | ||
UserInfoExtension.cs | ||
UserManagerWrapper.cs | ||
UserPhotoManager.cs | ||
UserPhotoThumbnailManager.cs | ||
UserPhotoThumbnailSettings.cs | ||
UserSortOrder.cs |