gopienkonikita 3af4f321cb Merge branch 'develop' into feature/VDR-room ... # 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/store/CreateEditRoomStore.js # public/locales/en/Common.json		2024-06-07 16:25:58 +03:00
..
client	Merge branch 'develop' into feature/VDR-room	2024-06-07 16:25:58 +03:00
doceditor	Merge pull request #459 from ONLYOFFICE/bugfix/Bug68197	2024-06-07 11:38:52 +04:00
login	Returning a backdrop solution without using portals.	2024-06-05 18:08:59 +03:00
management	Merge branch 'develop' into feature/editor-in-same-tab	2024-05-27 16:31:42 +04:00
shared	Merge branch 'develop' into feature/VDR-room	2024-06-07 16:25:58 +03:00