pavelbannov f52f32a6af Merge branch 'develop' into feature/asc.apicache ... # Conflicts: # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.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/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs		2023-02-07 17:07:20 +03:00
..
ProgressItems	Merge branch 'develop' into feature/asc.apicache	2023-02-07 17:07:20 +03:00
BackupService.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
BackupSettings.cs	backup: add regions	2022-09-05 14:27:38 +03:00
BackupWorker.cs	Merge branch 'develop' into feature/migration_personal	2022-10-28 12:16:36 +03:00