Artem Tarasov 4031a609b8 Merge branch 'develop' into hotfix/documents-bugfix ... # Conflicts: # web/ASC.Web.Common/package.json # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-11-10 13:34:04 +03:00
..
public	Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file	2020-11-09 18:33:45 +03:00
src	Merge branch 'develop' into hotfix/documents-bugfix	2020-11-10 13:34:04 +03:00
.env	web: files: Fixed proxy configure for images and socketjs	2020-02-26 11:04:26 +03:00
.gitignore	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
analyse.js	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
config-overrides.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
package.json	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
yarn.lock	yarn.lock update	2020-11-03 17:39:49 +03:00