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
..
Data	code cleanup	2022-04-14 22:42:15 +03:00
Modules	add column removed in backup_backup	2023-01-27 18:12:02 +03:00
BackupFileInfo.cs	added new license headers	2022-03-15 21:00:53 +03:00
BackupPortalTask.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
ColumnMapper.cs	code cleanup	2022-04-14 22:42:15 +03:00
DbFactory.cs	asc.apicache	2022-12-16 15:41:09 +03:00
DeletePortalTask.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
KeyHelper.cs	migration personal: first version backup	2022-08-10 12:25:53 +03:00
PortalTaskBase.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
RestoreDbModuleTask.cs	Merge branch 'release/rc-v1.2.0' into feature/migration_personal	2022-11-29 13:07:12 +03:00
RestorePortalTask.cs	add column removed in backup_backup	2023-01-27 18:12:02 +03:00
TransferPortalTask.cs	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00