DocSpace-client/packages
Alexey Safronov c51fb3fe8f Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
#	packages/client/src/pages/PortalSettings/categories/integration/LDAP/styled-components/StyledLdapPage.js
#	packages/client/src/pages/Wizard/index.js
2024-09-02 19:28:07 +04:00
..
client Merge branch 'hotfix/v2.6.1' into develop 2024-09-02 19:28:07 +04:00
doceditor Merge branch 'hotfix/v2.6.1' into develop 2024-08-30 13:11:09 +04:00
login Login:App:TenantList: fix import 2024-08-30 14:52:01 +04:00
management Merge branch 'hotfix/v2.6.1' into develop 2024-08-29 14:27:18 +04:00
shared Merge branch 'hotfix/v2.6.1' into develop 2024-09-02 19:28:07 +04:00