Alexey Safronov a2302aa248 Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/components/PrivateRouteWrapper/index.tsx # packages/client/src/pages/Confirm/sub-components/activateUser.js # packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/CertificateDialog.js # packages/client/src/pages/PublicRoom/sub-components/RoomStyles.js # packages/login/src/app/(root)/layout.tsx # packages/login/src/app/(root)/page.tsx # packages/login/src/app/layout.tsx # packages/login/src/components/LoginForm/index.tsx # packages/login/src/types/index.ts # packages/login/src/utils/actions.ts # packages/shared/constants/index.ts # packages/shared/themes/base.ts		2024-08-09 17:23:25 +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-09 17:23:25 +04:00
offline
scripts	Merge branch 'hotfix/v2.6.1' into develop	2024-08-02 17:24:09 +04:00
thirdparty	Fix getObjectByLocation (zoom download issue)	2024-04-17 20:10:04 +04:00
appIcon-180.png
appIcon-192.png
appIcon-512.png
icon.svg
index.ts
manifest.json	resource correction	2024-05-22 22:54:57 +03:00