Tatiana Lopaeva 0dfab5563b Merge branch 'feature/VDR-room' into feature/VDR-watermarks ... # Conflicts: # packages/client/public/locales/en/CreateEditRoomDialog.json # packages/components/tabs-container/index.js # packages/components/tabs-container/styled-tabs-container.js # packages/components/themes/base.js # packages/components/utils/globalColors.js # public/locales/en/Common.json		2024-05-02 10:42:07 +03:00
..
client	Merge branch 'feature/VDR-room' into feature/VDR-watermarks	2024-05-02 10:42:07 +03:00
common/components/Watermarks	Merge branch 'feature/VDR-room' into feature/VDR-watermarks	2024-05-02 10:42:07 +03:00
doceditor	Merge branch 'release/v2.5.0' into develop	2024-04-19 19:10:43 +04:00
login	Merge branch 'release/v2.5.0' into develop	2024-04-19 13:13:00 +04:00
management	Management: Add using system font in management	2024-04-18 12:48:03 +02:00
shared	Merge branch 'feature/VDR-room' into feature/VDR-watermarks	2024-05-02 10:42:07 +03:00