DocSpace-client/web/ASC.Web.Components
Andrey Savihin b6e46a305c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/Form/userForm.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	web/ASC.Web.Components/src/components/input-block/index.js
#	web/ASC.Web.Components/src/index.js
2019-08-28 18:23:16 +03:00
..
scripts web: Added babel-plugin-styled-components 2019-06-03 10:00:00 +03:00
src Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-28 18:23:16 +03:00
.gitignore People: EmployeeWraper: DisplayName, AvatarSmall 2019-06-07 14:34:09 +03:00
asc-web-components.code-workspace web: components: Added group selector into AdvancedSelector 2019-08-27 10:52:55 +03:00
package.json web: components: bump version 2019-08-28 16:58:33 +03:00
README.md web: Changed README.md 2019-05-24 17:24:16 +03:00
rollup.config.js web: components: Fixed dynamic package.json version 2019-08-19 17:52:28 +03:00
yarn.lock web: components: Changed dist.package.json to dynamic creation of package.json by rollup-plugin: "rollup-plugin-generate-package-json" 2019-08-19 16:19:55 +03:00