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
ApiModels	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
Core	Resources renamed	2023-01-18 18:53:09 +03:00
img
Log
Mapping	fix is default	2022-10-14 23:59:18 +03:00
Properties	nlog: refactoring service name	2022-09-16 16:41:51 +03:00
appsettings.json
ASC.Web.Api.csproj	Merge pull request #1149 from ONLYOFFICE/feature/dotnet7	2023-01-19 22:00:57 +03:00
ASC.Web.Api.sln
GlobalUsings.cs	refactoring	2022-11-24 17:21:34 +03:00
Program.cs	fix ide001	2022-11-07 12:49:29 +03:00
Startup.cs	Merge branch 'develop' into feature/fix-whitelable	2022-12-12 17:22:03 +03:00