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
..
FCKEditorPathUtility.cs	GetDataStore tenant string to int	2022-10-28 15:23:51 +03:00
PathHelper.cs	added new license headers	2022-03-15 21:00:53 +03:00