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
..
Client	Merge branch 'master' into feature/advanced-selector-v2	2019-12-14 12:32:31 +03:00
Server	Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore	2019-12-09 16:08:48 +03:00