gopienkonikita a77aef1970 Merge branch 'master' into Refactoring/remove-react-bootstrap ... # Conflicts: # products/ASC.People/Client/package.json # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/package.json # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/package.json		2019-12-09 15:29:04 +03:00
..
ASC.People	Merge branch 'master' into Refactoring/remove-react-bootstrap	2019-12-09 15:29:04 +03:00