gopienkonikita 4b51e4ad4f Merge branch 'master' into Refactoring/remove-react-bootstrap ... # Conflicts: # products/ASC.People/Client/src/custom.scss # web/ASC.Web.Client/src/custom.scss # web/ASC.Web.Common/.storybook/styles.scss # web/ASC.Web.Components/.storybook/styles.scss		2019-12-06 15:58:10 +03:00
..
Client	Merge branch 'master' into Refactoring/remove-react-bootstrap	2019-12-06 15:58:10 +03:00
Server	.net core up to 3.1	2019-12-06 12:12:51 +03:00