DocSpace-buildtools/packages
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
..
browserslist-config-asc Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
client Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00
common Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00
components Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00
editor Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00
login Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00
auto-changelog-2.3.1.tgz Web: Restored work of auto-changelog and debug-info with local packages/auto-changelog-2.3.1.tgz 2022-08-26 17:59:52 +03:00