Alexey Safronov a639635c98 Merge branch 'develop' into feature/ldap-settings ... # Conflicts: # packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js # packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js # packages/login/src/components/LoginForm/index.tsx # packages/shared/store/SettingsStore.ts # public/locales/en/Common.json		2024-06-17 15:17:07 +04:00
..
Common.json	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00