Alexey Safronov 3dac1a4874 Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/UsersTableRow.tsx # packages/shared/components/share/sub-components/LinkRow.tsx		2024-08-14 12:47:36 +04:00
..
css
fonts/v35
images	Merge branch 'develop' into feature/public-edit	2024-07-25 11:25:59 +03:00
locales	Merge branch 'hotfix/v2.6.1' into develop	2024-08-12 19:10:02 +04:00
offline
scripts	Merge branch 'hotfix/v2.6.1' into develop	2024-08-14 12:47:36 +04:00
thirdparty
appIcon-180.png
appIcon-192.png
appIcon-512.png
icon.svg
index.ts
manifest.json