AlexeySafronov d00d16ee02 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Client/yarn.lock # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/src/components/pages/Wizard/index.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/src/api/settings/index.js # web/ASC.Web.Common/src/pages/login/index.js # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/src/utils/index.js # web/ASC.Web.Common/yarn.lock		2020-10-05 13:32:26 +03:00
..
public	Web: Files : Fixed editor url, always last	2020-09-28 17:46:27 +03:00
src	Web: Files : Fixed open files after create	2020-09-30 11:57:22 +03:00
.env	web: files: Fixed proxy configure for images and socketjs	2020-02-26 11:04:26 +03:00
.gitignore
analyse.js	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
config-overrides.js
package.json	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
yarn.lock	Merge branch 'master' into feature/files	2020-10-05 13:32:26 +03:00