Alexey Safronov 027646f8ea Merge branch 'release/v2.5.0' into develop ... # Conflicts: # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js # packages/doceditor/src/app/global-error.tsx # packages/doceditor/src/components/Root.tsx # packages/doceditor/src/hooks/useUpdateSearchParamId.ts # packages/doceditor/src/utils/actions.ts # packages/doceditor/src/utils/index.ts		2024-03-22 16:20:48 +04:00
..
index.ts	Merge branch 'release/v2.5.0' into develop	2024-03-22 16:20:48 +04:00