Tatiana Lopaeva c8df2d9703 Merge branch 'develop' into feature/branding-correction ... # Conflicts: # packages/client/public/locales/ar-SA/CreateEditRoomDialog.json # packages/client/public/locales/az/CreateEditRoomDialog.json # packages/client/public/locales/bg/CreateEditRoomDialog.json # packages/client/public/locales/cs/CreateEditRoomDialog.json # packages/client/public/locales/de/CreateEditRoomDialog.json # packages/client/public/locales/el-GR/CreateEditRoomDialog.json # packages/client/public/locales/en/CreateEditRoomDialog.json # packages/client/public/locales/es/CreateEditRoomDialog.json # packages/client/public/locales/fi/CreateEditRoomDialog.json # packages/client/public/locales/fr/CreateEditRoomDialog.json # packages/client/public/locales/hy-AM/CreateEditRoomDialog.json # packages/client/public/locales/it/CreateEditRoomDialog.json # packages/client/public/locales/ja-JP/CreateEditRoomDialog.json # packages/client/public/locales/ko-KR/CreateEditRoomDialog.json # packages/client/public/locales/lo-LA/CreateEditRoomDialog.json # packages/client/public/locales/lv/CreateEditRoomDialog.json # packages/client/public/locales/nl/CreateEditRoomDialog.json # packages/client/public/locales/pl/CreateEditRoomDialog.json # packages/client/public/locales/pt-BR/CreateEditRoomDialog.json # packages/client/public/locales/pt/CreateEditRoomDialog.json # packages/client/public/locales/ro/CreateEditRoomDialog.json # packages/client/public/locales/ru/CreateEditRoomDialog.json # packages/client/public/locales/si/CreateEditRoomDialog.json # packages/client/public/locales/sk/CreateEditRoomDialog.json # packages/client/public/locales/sl/CreateEditRoomDialog.json # packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json # packages/client/public/locales/tr/CreateEditRoomDialog.json # packages/client/public/locales/uk-UA/CreateEditRoomDialog.json # packages/client/public/locales/vi/CreateEditRoomDialog.json # packages/client/public/locales/zh-CN/CreateEditRoomDialog.json		2024-06-07 15:49:36 +03:00
..
Common.json	Merge branch 'develop' into feature/branding-correction	2024-06-07 15:49:36 +03:00