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
..
public	added translations	2024-08-06 13:37:18 +03:00
scripts	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
src	Merge branch 'hotfix/v2.6.1' into develop	2024-08-09 17:23:25 +04:00
.babelrc
.gitattributes
.gitignore
Dockerfile	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
index.d.ts	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
jsconfig.json	Client: fix after rewrite to typescript	2023-12-27 17:45:22 +03:00
package.json	Bump version to v2.6.1	2024-07-30 19:53:48 +04:00
tsconfig.json
webpack.config.js	Management: add hash for config and browser detector	2024-04-11 17:06:43 +03:00