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
..
base.ts	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00
commonTheme.ts	Client: Login: DocEditor Remove increasing value for RTL	2024-04-17 10:55:33 +02:00
dark.ts	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00
globalColors.ts	Merge branch 'release/v2.5.0' into develop	2024-03-22 16:20:48 +04:00
index.ts	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00