Alexey Safronov 8e148c4750 Merge branch 'develop' into feature/security-active-sessions ... # Conflicts: # public/locales/en/Common.json # public/locales/ru/Common.json		2024-08-29 14:32:53 +04:00
..
__mocks__
.storybook
api	Web: Client: Dialogs. added new parameter for resetting password on logout	2024-08-26 21:01:54 +05:00
components	Merge branch 'develop' into feature/security-active-sessions	2024-08-29 14:32:53 +04:00
constants	Merge branch 'hotfix/v2.6.1' into develop	2024-08-13 13:57:10 +04:00
dialogs/conflict-resolve	Merge branch 'hotfix/v2.6.1' into develop	2024-08-29 14:27:18 +04:00
enums	Merge branch 'develop' into feature/security-active-sessions	2024-08-29 14:32:53 +04:00
HOC
hooks
pages/PreparationPortal	Merge branch 'hotfix/v2.6.1' into develop	2024-08-29 14:27:18 +04:00
polyfills
routes
selectors	Merge branch 'hotfix/v2.6.1' into develop	2024-08-29 14:27:18 +04:00
skeletons	Merge branch 'develop' into feature/security-active-sessions	2024-08-23 10:34:49 +05:00
store	Merge branch 'hotfix/v2.6.1' into develop	2024-08-29 14:27:18 +04:00
styles
sw
themes	Merge branch 'develop' into feature/security-active-sessions	2024-08-29 14:32:53 +04:00
types	Merge branch 'hotfix/v2.6.1' into develop	2024-08-14 12:47:36 +04:00
utils	Merge branch 'hotfix/v2.6.1' into develop	2024-08-29 14:27:18 +04:00
.babelrc.json
.eslintrc.cjs
.gitignore
.prettierrc.json
babel.config.ts
index.d.ts
jest.config.ts
package.json	Merge branch 'develop' into feature/security-active-sessions	2024-08-23 10:34:49 +05:00
tsconfig.eslint.json
tsconfig.json