gopienkonikita 1813cab794 Merge branch 'develop' into feature/templates ... # Conflicts: # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/GlobalEvents/index.js # packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/create-components/SelectMembersPanel.tsx # packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js # packages/client/src/components/panels/AddUsersPanel/index.tsx # packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js # packages/client/src/store/DialogsStore.js # packages/shared/components/room-icon/index.tsx # packages/shared/themes/dark.ts # public/locales/en/Common.json		2024-08-28 17:33:27 +03:00
..
css	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00
fonts/v35	Web: Removed old fonts	2023-08-03 19:47:52 +05:00
images	Merge branch 'develop' into feature/templates	2024-08-28 17:33:27 +03:00
locales	Merge branch 'develop' into feature/templates	2024-08-28 17:33:27 +03:00
offline	Clients: Changed favicon for all index.html	2024-03-27 15:09:12 +03:00
scripts	Merge branch 'hotfix/v2.6.1' into develop	2024-08-22 12:29:56 +04:00
thirdparty	Fix getObjectByLocation (zoom download issue)	2024-04-17 20:10:04 +04:00
appIcon-180.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-192.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-512.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
icon.svg	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
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