Alexey Safronov 54a5b93ac0 Merge branch 'release/v2.6.0' into develop ... # Conflicts: # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectFileStep/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js		2024-07-16 12:59:23 +04:00
..
client	Merge branch 'release/v2.6.0' into develop	2024-07-16 12:59:23 +04:00
doceditor	Merge branch 'release/v2.6.0' into develop	2024-07-16 12:59:23 +04:00
login	Merge branch 'release/v2.6.0' into develop	2024-07-12 11:11:05 +04:00
management	Bump version to v2.6.0	2024-06-27 08:18:39 +03:00
shared	Merge branch 'release/v2.6.0' into develop	2024-07-16 12:59:23 +04:00