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
..
public	Merge branch 'develop' into feature/templates	2024-08-28 17:33:27 +03:00
scripts
src	Merge branch 'develop' into feature/templates	2024-08-28 17:33:27 +03:00
tests
.babelrc
.env
.eslintrc.cjs
.gitattributes
.gitignore
.prettierrc.json
analyse.js
codecept.conf.js
Dockerfile
global.d.ts
index.d.ts
jsconfig.json
package.json	Merge branch 'hotfix/v2.6.1' into develop	2024-08-23 20:41:35 +04:00
steps_file.js
steps.d.ts
tsconfig.eslint.json
tsconfig.json
webpack.config.js	Client: Fix bug with undefined imports	2024-08-21 15:19:32 +04:00