TatianaLopaeva e6fac866fe Merge branch 'develop' into feature/fix-hide/show-header ... # Conflicts: # web/ASC.Web.Common/src/components/NavMenu/index.js # web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js		2020-11-16 10:29:35 +03:00
..
public	Web: Files: added header loader	2020-11-12 13:30:54 +03:00
src	Merge branch 'develop' into feature/fix-hide/show-header	2020-11-16 10:29:35 +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	Update yarn.lock files	2020-11-12 15:06:18 +03:00