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
..
client	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00
common/components/Watermarks
doceditor	Bump version to v2.6.0	2024-06-27 08:18:39 +03:00
login	Login: Components: Fixed flags color.	2024-06-27 15:58:31 +03:00
management	Bump version to v2.6.0	2024-06-27 08:18:39 +03:00
shared	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00