Alexey Safronov 602ce53411 Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/index.js # packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx # packages/client/src/pages/PortalSettings/utils/settingsTree.js		2024-07-29 16:13:17 +04:00
..
public/locales	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +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-07-29 16:13:17 +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 'develop' into feature/oauth2-client	2024-06-28 13:28:10 +03: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