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
..
config
public/locales	Merge branch 'hotfix/v2.6.1' into feature/update-langs_2.6.1	2024-08-08 17:16:25 +04:00
scripts	Revert "Editor: fix build translations"	2024-04-09 10:17:40 +03:00
src	Merge branch 'hotfix/v2.6.1' into develop	2024-08-09 17:23:25 +04:00
.eslintrc.json
.gitignore
.prettierrc.json
index.d.ts	Doceditor: Added types	2024-05-31 21:32:33 +05:00
next.config.js
package.json	Merge branch 'hotfix/v2.6.1' into develop	2024-07-30 20:33:27 +04:00
server.js
server.prod.js
tsconfig.json	Revert "Editor: fix build translations"	2024-04-09 10:17:40 +03:00