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
..
api	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
components	Merge branch 'develop' into feature/workspaces	2021-01-29 16:39:00 +03:00
constants	Merge branch 'develop' into feature/workspaces	2021-01-11 12:21:59 +03:00
desktop	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
history	Frontend: client's code re-organization	2020-11-24 13:18:23 +03:00
pages	Web: Fixed import errors	2021-01-27 10:29:15 +03:00
store	Merge branch 'develop' into feature/workspaces	2021-01-29 16:39:00 +03:00
utils	Web: Applied WP:ModuleFederation best practices	2021-01-26 00:55:46 +03:00
index.js	Merge branch 'develop' into feature/workspaces	2021-01-11 12:21:59 +03:00