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
..
Classes	asc.apicache	2022-12-16 15:41:09 +03:00
Controllers	Merge branch 'develop' into feature/migration_personal	2022-11-11 15:05:26 +03:00
Interfaces	Merge branch 'develop' into feature/remove-waste	2022-10-19 14:18:52 +03:00
Models	fix merge	2022-10-19 14:30:14 +03:00
Properties	fix merge	2022-10-19 14:30:14 +03:00
appsettings.json	fix merge	2022-10-19 14:30:14 +03:00
ASC.ApiSystem.csproj	merge from develop	2022-12-01 14:52:46 +03:00
ConfigurationManagerExtension.cs	fix merge	2022-10-19 14:30:14 +03:00
GlobalUsings.cs	asc.apicache	2022-12-16 15:41:09 +03:00
Program.cs	asc.apicache	2022-12-16 15:41:09 +03:00
Startup.cs	ApiSystem: cors	2022-12-07 12:34:14 +03:00