Alexey Safronov 3b88c07178 Merge branch 'master' into feature/advanced-selector-v2 ... # Conflicts: # products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/src/components/index.js # web/ASC.Web.Common/yarn.lock # 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/index.js # web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed] #		2019-12-14 12:32:31 +03:00
..
groups	web: Common: Added support of fakeApi to getUserList and getGroupList methods	2019-12-06 16:37:04 +03:00
modules	web: Common: Moved api from store/services to root level	2019-11-25 15:52:34 +03:00
people	Merge branch 'master' into feature/advanced-selector-v2	2019-12-14 12:32:31 +03:00
portal	web: Common: Moved api from store/services to root level	2019-11-25 15:52:34 +03:00
settings	web: Common: Moved api from store/services to root level	2019-11-25 15:52:34 +03:00
user	web: Common: Moved api from store/services to root level	2019-11-25 15:52:34 +03:00
client.js	web: Common: Added PeopleSelector	2019-12-04 17:35:17 +03:00
index.js	web: Common: Moved api from store/services to root level	2019-11-25 15:52:34 +03:00