Elyor Djalilov c10aec0122 Merge branch 'develop' into feature/security-active-sessions ... # Conflicts: # packages/client/public/locales/en/Settings.json # packages/client/public/locales/ru/Settings.json # packages/client/src/HOCs/withPeopleContent.js # packages/client/src/components/FilesPanels/index.js # packages/client/src/helpers/people-helpers.js # packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js # packages/client/src/store/SelectionPeopleStore.js # packages/shared/enums/index.ts # public/locales/en/Common.json # public/locales/ru/Common.json		2024-06-19 11:46:30 +05:00
..
client	Merge branch 'develop' into feature/security-active-sessions	2024-06-19 11:46:30 +05:00
components/table-container
doceditor	Merge branch 'develop' into bugfix/68353	2024-06-17 12:36:09 +03:00
login	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00
management	Renaming.	2024-06-14 13:07:19 +03:00
shared	Merge branch 'develop' into feature/security-active-sessions	2024-06-19 11:46:30 +05:00