Artem Tarasov 0621fd9c86 Merge branch 'develop' into feature/login-ssr ... # Conflicts: # packages/client/src/components/dialogs/ConnectDialog/index.js # packages/login/src/Login.jsx # packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx # packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx # yarn.lock		2022-08-30 18:38:12 +03:00
..
AppServerConfig.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Merge branch 'develop' into feature/login-ssr	2022-08-30 18:38:12 +03:00
sharedDependencies.js	Web: Upgrade yarn to v3.2.2	2022-07-29 18:20:57 +03:00