Tatiana Lopaeva d385474caa Merge branch 'develop' into feature/user-quota ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/components/GlobalEvents/CreateRoomEvent.js # packages/client/src/components/GlobalEvents/EditRoomEvent.js # packages/client/src/components/MainBar/Bar.js # packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js # packages/client/src/helpers/constants.js # packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js # packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js # packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js # packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js # packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js # packages/client/src/pages/Home/Section/Filter/index.js # packages/client/src/store/FilesStore.js # packages/client/src/store/UsersStore.js # packages/client/src/store/index.js # packages/common/store/AuthStore.js # packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx # packages/shared/api/files/index.ts # packages/shared/api/files/types.ts # packages/shared/store/CurrentQuotaStore.ts # packages/shared/store/UserStore.ts # public/locales/en/Common.json		2024-02-06 11:52:52 +03:00
..
filter.ts	Shared: fix eslint and ts problems	2024-01-23 10:24:57 +03:00
index.ts	Merge branch 'develop' into feature/user-quota	2024-02-06 11:52:52 +03:00
types.ts	Merge branch 'develop' into feature/user-quota	2024-02-06 11:52:52 +03:00