Tatiana Lopaeva 7f3ee86798 Merge branch 'develop' into feature/user-quota ... # Conflicts: # packages/client/public/locales/en/Settings.json # packages/client/public/locales/ru/Settings.json # packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js # packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js # packages/client/src/pages/Home/Section/AccountsBody/RowView/PeopleRowContainer.js # packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.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/Body/TableView/sub-components/RoomsRowData.js # packages/client/src/pages/Home/Section/Filter/index.js # packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/client/src/store/FilesStore.js # packages/common/store/CurrentQuotaStore.js # packages/common/utils/index.ts # packages/components/table-container/TableHeader.js # public/locales/en/Common.json		2023-11-29 10:56:04 +03:00
..
Common.json	Merge branch 'develop' into feature/user-quota	2023-11-29 10:56:04 +03:00