DocSpace-client/packages/doceditor
Alexey Safronov ee7fe469b2 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/Home/Section/Body/TableView/sub-components/RecentRowData.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
#	packages/client/src/pages/Wizard/index.js
#	packages/client/src/store/TableStore.js
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
2024-08-29 14:27:18 +04:00
..
config
public/locales added translations 2024-08-27 11:50:33 +03:00
scripts
src Merge branch 'hotfix/v2.6.1' into develop 2024-08-23 20:41:35 +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