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
..
public/locales	Revert 6bbf8e3a62	2023-01-31 18:56:58 +03:00
scripts	Web: fix build	2023-02-06 19:15:04 +03:00
src	Merge branch 'master' into develop	2023-02-07 14:31:22 +03:00
webpack	Web: fix build	2023-02-06 19:15:04 +03:00
.babelrc	Web: Editor/Client: added ts support	2022-08-17 10:21:43 +03:00
.gitattributes	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitignore	Web:Editor: add autoGeneratedTranslations.ts to gitignore file	2023-02-03 19:09:36 +03:00
babel.config.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
Dockerfile	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
jsconfig.json	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Web: fix build	2023-02-06 19:15:04 +03:00