DocSpace-client/public/locales/en
Alexey Safronov 99e265ebee Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/client/src/components/PrivateRouteWrapper/index.tsx
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/login/src/app/layout.tsx
#	packages/login/src/components/LoginForm/index.tsx
#	packages/login/src/middleware.ts
#	packages/login/src/utils/index.ts
#	packages/shared/components/table/TableHeader.tsx
#	packages/shared/routes/Route.private.tsx
2024-07-11 12:27:31 +04:00
..
Common.json Merge branch 'release/v2.6.0' into develop 2024-07-11 12:27:31 +04:00