Tatiana Lopaeva ca1cd06fad Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/public/images/plus.react.svg # packages/client/src/pages/PortalSettings/categories/common/branding.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js # packages/client/src/pages/PortalSettings/index.js # packages/common/components/PrivateRoute/index.js		2022-10-04 17:13:46 +03:00
..
public	Merge branch 'develop' into feature/stripe	2022-10-04 17:13:46 +03:00
src	Merge branch 'develop' into feature/stripe	2022-10-04 17:13:46 +03:00
tests
.babelrc
.env
.gitattributes
.gitignore
analyse.js
codecept.conf.js
Dockerfile
jsconfig.json
package.json	Merge branch 'develop' into feature/login-ssr	2022-08-30 18:38:12 +03:00
steps_file.js
steps.d.ts
webpack.config.js	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile	2022-09-08 17:31:12 +03:00