gopienkonikita 1c0f72731d Merge branch 'develop' into feature/templates ... # Conflicts: # packages/client/public/locales/en/Files.json # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js # packages/client/src/components/panels/AddUsersPanel/index.tsx # packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js # packages/client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js # packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js # packages/client/src/store/DialogsStore.js # packages/shared/components/selector/Selector.tsx # packages/shared/components/selector/Selector.types.ts		2024-07-25 11:32:25 +03:00
..
client	Merge branch 'develop' into feature/templates	2024-07-25 11:32:25 +03:00
doceditor	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
login	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
management	Translations: Fix WrongTranslationTagsTest issue (DeletePortalText)	2024-07-19 18:49:49 +04:00
shared	Merge branch 'develop' into feature/templates	2024-07-25 11:32:25 +03:00