Alexey Safronov 7d0ea33245 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore ... Conflicts: products/ASC.People/Client/src/components/pages/Home/index.js web/ASC.Web.Components/src/components/content-row/index.js		2019-07-24 17:48:40 +03:00
..
ASC.People	Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore	2019-07-24 17:48:40 +03:00