pavelbannov 624391ab26 Merge branch 'develop' into feature/migration_personal ... # Conflicts: # common/ASC.Data.Backup.Core/BackupAjaxHandler.cs # common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs # common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs # common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs # common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs # common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs # common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs # common/ASC.Data.Storage/Encryption/EncryptionOperation.cs # common/ASC.Data.Storage/StorageFactory.cs # common/ASC.Data.Storage/StorageUploader.cs		2022-10-31 21:15:23 +03:00
..
IntegrationEvents	nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property	2022-09-15 17:44:04 +03:00
EncryptionFactory.cs	added new license headers	2022-03-15 21:00:53 +03:00
EncryptionOperation.cs	Merge branch 'develop' into feature/migration_personal	2022-10-31 21:15:23 +03:00
EncryptionWorker.cs	encryption service: migrate from ICacheNotify to RabbitMQ	2022-05-23 22:06:22 +03:00
FakeCrypt.cs	added new license headers	2022-03-15 21:00:53 +03:00
NotifyHelper.cs	Log: refactoring	2022-05-26 12:01:54 +03:00