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
..
public	web: People: Fixed broken logo on login from People page	2019-11-26 09:52:34 +03:00
src	Merge branch 'master' into feature/advanced-selector-v2	2019-12-05 14:17:45 +03:00
.env	temp fix cra bug with public_url in development mode	2019-07-15 12:33:28 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
config-overrides.js	People.Client: fixed webpack config for moving translation resources	2019-09-03 13:35:50 +03:00
package.json	Web: People: removed reactstrap from people module	2019-12-04 10:11:13 +03:00
yarn.lock	Merge branch 'master' into feature/advanced-selector-v2	2019-12-05 14:17:45 +03:00