Commit Graph

7 Commits

Author SHA1 Message Date
c8a772837f web: Update yarn.lock 2019-12-06 16:40:57 +03:00
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
b5eb5e6cf7 Web: Common: removed reactstrap from web.common 2019-12-04 10:12:57 +03:00
7b66b23686 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2019-12-03 16:41:03 +03:00
4128d43d89 web: Update yarn.lock files 2019-12-03 16:24:13 +03:00
f46c12cc32 Update yarn.lock files 2019-11-27 14:26:20 +03:00
8bf0c002c0 web: Common: Added yarn.lock 2019-11-27 13:21:46 +03:00