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
..
Api	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
DocStore@776d5631ee	fix	2022-08-09 17:11:40 +03:00
Extensions	nlog: fixed config	2022-09-15 18:17:23 +03:00
Helpers	Bug 60379	2022-12-29 14:29:07 +03:00
Log	add loggers	2022-05-12 11:14:00 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	merge from develop	2022-12-01 14:52:46 +03:00
GlobalUsings.cs	get reference data	2022-12-13 14:00:20 +03:00
ProductEntryPoint.cs	Merge branch 'develop' into feature/remove-waste	2022-11-07 11:25:54 +03:00
Program.cs	fix ide001	2022-11-07 12:49:29 +03:00
Startup.cs	Files: removed products/files/httphandlers	2022-12-08 13:24:57 +03:00