IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c4611513b7
DocSpace-client/web/ASC.Web.Components
History
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
..
.storybook Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-07 10:45:57 +03:00
.vscode
config
public web: Storybook: Split titles of storybooks 2019-11-26 14:48:42 +03:00
scripts
src Merge branch 'master' into feature/advanced-selector-v2 2019-12-14 12:32:31 +03:00
test
.editorconfig
.eslintignore
.eslintrc.js
.gitignore
babel.config.js
jest.config.js
package.json Merge branch 'master' into feature/advanced-selector-v2 2019-12-14 12:32:31 +03:00
README.md
rollup.config.js
yarn.lock Merge branch 'master' into feature/advanced-selector-v2 2019-12-14 12:32:31 +03:00

README.md