Tatiana Lopaeva 61290de23c Merge branch 'feature/VDR-room' into feature/VDR-watermarks ... # Conflicts: # packages/client/public/locales/en/CreateEditRoomDialog.json # packages/client/src/components/GlobalEvents/CreateRoomEvent.js # packages/client/src/components/GlobalEvents/EditRoomEvent.js # packages/shared/components/image-editor/Dropzone/index.tsx # packages/shared/components/language-combobox/LanguageCombobox.types.ts # packages/shared/components/tabs-container/TabsContainer.styled.tsx # packages/shared/components/tabs-container/TabsContainer.tsx # packages/shared/enums/index.ts # packages/shared/themes/base.ts # packages/shared/themes/dark.ts # packages/shared/utils/common.ts		2024-06-26 16:29:29 +03:00
..
css	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
fonts/v35
images	Deleted useless code.	2024-06-26 16:04:12 +03:00
locales	Merge branch 'feature/VDR-room' into feature/VDR-watermarks	2024-06-26 16:29:29 +03:00
offline	Clients: Changed favicon for all index.html	2024-03-27 15:09:12 +03:00
scripts	Web: delete openOnNewPage from config	2024-05-21 13:09:17 +03:00
thirdparty	Fix getObjectByLocation (zoom download issue)	2024-04-17 20:10:04 +04:00
appIcon-180.png
appIcon-192.png
appIcon-512.png
icon.svg
index.ts	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
manifest.json	resource correction	2024-05-22 22:54:57 +03:00