AlexeySafronov 652c7bd906 Merge branch 'develop' into feature/workspaces ... # Conflicts: # packages/asc-web-common/src/components/Layout/MobileLayout.js # packages/asc-web-common/src/components/Layout/ScrollToTop.js # packages/asc-web-common/src/components/Layout/context.js # packages/asc-web-common/src/components/Layout/index.js # packages/asc-web-common/src/components/NavMenu/index.js # packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js # packages/asc-web-common/src/components/PageLayout/index.js # packages/asc-web-common/src/components/PageLayout/sub-components/article.js # packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js # packages/asc-web-common/src/components/PageLayout/sub-components/section.js # packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg # packages/asc-web-components/src/components/icons/svg/clear.active.react.svg # packages/asc-web-components/src/components/icons/svg/load.error.react.svg # products/ASC.Files/Client/package.json # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/store/files/actions.js # products/ASC.People/Client/package.json # products/ASC.People/Client/src/App.js # products/ASC.People/Client/src/components/pages/Profile/index.js # products/ASC.People/Client/src/components/pages/ProfileAction/index.js # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/package.json # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/package.json # web/ASC.Web.Components/yarn.lock # yarn.lock		2021-01-29 16:39:00 +03:00
..
public	Merge branch 'develop' into feature/workspaces	2021-01-11 12:21:59 +03:00
src	Merge branch 'develop' into feature/workspaces	2021-01-29 16:39:00 +03:00
.babelrc	Web: People: init People build and loading (Moved out from CRA)	2020-12-03 13:09:33 +03:00
.env	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
config-overrides.js	yarn workspaces init commit	2020-11-21 16:07:23 +03:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Bump version to v0.0.10	2021-01-29 11:13:27 +03:00
webpack.config.js	Web: Applied WP:ModuleFederation best practices	2021-01-26 00:55:46 +03:00