DocSpace-buildtools/packages/editor
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
..
public Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
src Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00
webpack Web: Editor/Client: added ts support 2022-08-17 10:21:43 +03:00
.babelrc Web: Editor/Client: added ts support 2022-08-17 10:21:43 +03:00
.gitattributes Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
.gitignore Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
babel.config.js Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
Dockerfile Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
jsconfig.json Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
package.json Merge branch 'develop' into feature/login-ssr 2022-08-30 18:38:12 +03:00