Alexey Safronov 1c0c743714 Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js # packages/client/src/components/panels/StyledPanels.js # packages/client/src/pages/Home/InfoPanel/Header/styles/common.js # packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx # packages/shared/components/aside/Aside.styled.tsx # packages/shared/components/filter/Filter.styled.ts # packages/shared/components/modal-dialog/sub-components/CloseButton.tsx # packages/shared/components/selector/Selector.styled.ts		2024-08-26 23:08:26 +04:00
..
public/locales	Merge branch 'hotfix/v2.6.1' into develop	2024-08-09 17:23:25 +04:00
scripts	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
src	Merge branch 'hotfix/v2.6.1' into develop	2024-08-26 23:08:26 +04:00
.eslintrc.json	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
.gitignore	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
.prettierrc.json	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
index.d.ts	Login: add check for public oauth client	2024-06-19 18:14:43 +03:00
next.config.js	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
package.json	Merge branch 'hotfix/v2.6.1' into develop	2024-07-30 20:33:27 +04:00
server.js	Login: fix start scripts	2024-05-02 17:16:45 +03:00
server.prod.js	Login: fix start scripts	2024-05-02 17:16:45 +03:00
tsconfig.json	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00