Alexey Safronov eeede19a30 Merge branch 'develop' into feature/form-room-pdf ... # Conflicts: # packages/client/src/components/Badges.js # packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts # packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/SelectedFolderStore.js # packages/client/src/store/SettingsStore.js # packages/common/constants/index.js # packages/common/store/InfoPanelStore.js # packages/components/room-logo/index.js # packages/shared/utils/common.ts		2024-01-18 19:31:46 +04:00
..
index.ts	Merge branch 'develop' into feature/form-room-pdf	2024-01-18 19:31:46 +04:00