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
..
errors	web: Common: Fixed ru translation.json	2019-11-26 17:42:30 +03:00
layout	ASC.Web.Common: made a general layout for all clients	2019-11-28 16:36:55 +03:00
login	web.components: Text: refactoring, separating component to 3 components, apply changes	2019-12-04 12:36:13 +03:00
module-tile	Merge branch 'master' into feature/components-custom-styling	2019-12-05 10:26:02 +03:00
people-selector	Merge branch 'master' into feature/advanced-selector-v2	2019-12-05 14:17:45 +03:00
routing	web: Common: Replaced state to props	2019-11-26 17:47:02 +03:00
index.js	web: Common: Added PeopleSelector	2019-12-04 17:35:17 +03:00