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
..
locales	Merge branch 'hotfix/v2.6.1' into develop	2024-08-09 17:23:25 +04:00
index.html	Client: Removed temp data	2024-06-17 15:17:57 +04:00