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
..
config
public/locales	Doceditor:Components:CompletedForm Fixed translation	2024-07-23 16:21:09 +05:00
scripts	Revert "Editor: fix build translations"	2024-04-09 10:17:40 +03:00
src	Merge branch 'release/v2.6.0' into hotfix/v2.6.1	2024-07-26 15:31:25 +04:00
.eslintrc.json
.gitignore
.prettierrc.json	Login(nextjs): init commit	2024-03-25 12:20:44 +03:00
index.d.ts	Doceditor: Added types	2024-05-31 21:32:33 +05:00
next.config.js	DocEditor: Added top banner for minimazed js files	2024-03-22 18:47:05 +04:00
package.json	Merge branch 'develop' into feature/oauth2-client	2024-06-28 13:28:10 +03:00
server.js	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
server.prod.js	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
tsconfig.json	Revert "Editor: fix build translations"	2024-04-09 10:17:40 +03:00