Ilya Oleshko 51fb13d035 Merge branch 'master' into develop ... # Conflicts: # packages/client/src/pages/Files.jsx # packages/common/components/Navigation/Navigation.js # packages/common/components/Navigation/sub-components/control-btn.js # packages/common/components/Navigation/sub-components/plus-btn.js # 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/ProviderDao/ProviderFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs # products/ASC.Files/Server/Api/OperationController.cs # yarn.lock		2023-08-01 14:39:31 +03:00
..
workflows	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00