pavelbannov a414d68182 Merge branch 'develop' into feature/migration_personal ... # Conflicts: # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs # common/ASC.Data.Storage/StorageFactory.cs		2022-10-28 12:16:36 +03:00
..
BackupProgressItem.cs	Merge branch 'develop' into feature/migration_personal	2022-10-28 12:16:36 +03:00
BackupProgressItemEnum.cs	code cleanup	2022-04-14 22:42:15 +03:00
BackupProgressItemEnumConverter.cs	code cleanup	2022-04-14 22:42:15 +03:00
BaseBackupProgressItem.cs	Custom logger replaced with Microsoft.Extensions.Logging	2022-04-26 20:53:48 +03:00
RestoreProgressItem.cs	Merge branch 'develop' into feature/migration_personal	2022-09-05 17:39:20 +03:00
TransferProgressItem.cs	Merge branch 'develop' into feature/migration_personal	2022-10-28 12:16:36 +03:00