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
..
ASC.Web.Api	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/asc.apicache	2023-02-07 17:07:20 +03:00
ASC.Web.HealthChecks.UI	Merge branch 'develop' into feature/asc.apicache	2023-02-07 17:07:20 +03:00
ASC.Web.Studio	merge from release/rc-v1.2.0. fixed problem and update dll	2023-01-19 15:47:09 +03:00