Artem Tarasov 93e6777b27 Merge branch 'develop' into feature/fix-hide/show-header ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/index.js # web/ASC.Web.Common/src/components/PageLayout/index.js # web/ASC.Web.Components/package.json		2021-01-27 18:03:12 +03:00
..
public	Web: Files: fixed icon name typo	2021-01-22 11:22:43 +03:00
src	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-27 18:03:12 +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	Bump version to v0.0.9	2021-01-18 19:06:31 +03:00
yarn.lock	Update yarn.lock files	2021-01-27 17:23:40 +03:00