Alexey Safronov 8bd3c86d2b Merge branch 'master' into feature/advanced-selector-v2 ... # Conflicts: # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Components/package.json # web/ASC.Web.Components/src/components/advanced-selector/index.js # web/ASC.Web.Components/src/components/help-button/index.js # web/ASC.Web.Components/src/components/icon-button/index.js # Changed (by Text component changes): # web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js # web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js # web/ASC.Web.Components/src/components/advanced-selector/sub-components/groups/header.js # web/ASC.Web.Components/src/components/advanced-selector/sub-components/options/body.js # web/ASC.Web.Components/src/components/advanced-selector/sub-components/selector.js # web/ASC.Web.Common/src/components/people-selector/index.js		2019-12-05 14:17:45 +03:00
..
ASC.People	Merge branch 'master' into feature/advanced-selector-v2	2019-12-05 14:17:45 +03:00