pavelbannov c89b8ca427 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs # common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.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/PortalTaskBase.cs # common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs		2023-02-07 14:31:22 +03:00
..
ASC.Web.Api	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
ASC.Web.Core	replace CreateScope() => CreateScopeAsync()	2023-01-24 20:33:27 +03:00
ASC.Web.HealthChecks.UI	healthcheck: update dll	2023-01-24 20:48:33 +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