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
..
fonts	Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF	2021-07-27 15:56:19 +03:00
images	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
locales	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
offline	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
scripts	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00
thirdparty	Web: Fixed callback pages, added login callback for desktop client	2021-10-19 10:31:34 +03:00
appIcon-180.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-192.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-512.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
favicon.ico	Web: change path for favicon.ico	2023-01-23 13:21:51 +03:00
icon.svg	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
manifest.json	Update manifest.json	2022-11-13 22:35:19 +03:00