gopienkonikita 0231e60cc7 Merge branch 'master' into feature/files ... # Conflicts: # web/ASC.Web.Components/package.json # web/ASC.Web.Components/src/components/icons/svg/index.js # web/ASC.Web.Components/src/index.js		2020-07-28 17:34:46 +03:00
..
ASC.Files	Merge branch 'master' into feature/files	2020-07-28 17:34:46 +03:00
ASC.People	Update yarn.lock files + bump versions	2020-07-17 18:03:08 +03:00