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
..
client	Merge branch 'develop' into feature/templates	2024-08-28 17:33:27 +03:00
doceditor	Merge branch 'hotfix/v2.6.1' into develop	2024-08-23 20:41:35 +04:00
login	Merge branch 'hotfix/v2.6.1' into develop	2024-08-26 23:08:26 +04:00
management	Merge branch 'hotfix/v2.6.1' into develop	2024-08-22 12:29:56 +04:00
shared	Merge branch 'develop' into feature/templates	2024-08-28 17:33:27 +03:00