DmitrySychugov a1f37ebc04 Merge branch 'feature/VDR-room' into feature/VDR-indexing ... # Conflicts: # packages/client/public/locales/en/CreateEditRoomDialog.json # packages/client/public/locales/en/Files.json # packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js # packages/client/src/helpers/filesUtils.js # packages/client/src/pages/Home/Section/Body/TableView/sub-components/RowData.js # packages/shared/components/table/TableHeader.tsx # public/locales/en/Common.json		2024-06-27 15:48:33 +05:00
..
client	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-06-27 15:48:33 +05:00
doceditor	Merge pull request #496 from ONLYOFFICE/bugfix/form-room	2024-06-19 19:44:53 +04:00
login	Merge branch 'develop' into feature/sr-cyrl	2024-06-20 12:46:42 +04:00
management	edited variables sr-cyrl	2024-06-18 11:28:09 +03:00
shared	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-06-27 15:48:33 +05:00