DmitrySychugov 93a04c0392 Merge branch 'feature/VDR-room' into feature/VDR-indexing ... # Conflicts: # packages/client/src/HOCs/withQuickButtons.js # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/QuickButtons.js # packages/client/src/pages/Home/Section/Header/index.js # packages/client/src/store/ContextOptionsStore.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/SelectedFolderStore.ts		2024-07-11 12:35:06 +05:00
..
index.ts	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00